diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index eb93a0d..105bca2 100644
--- a/GIS Base Map/Gun Run.qgs	
+++ b/GIS Base Map/Gun Run.qgs	
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis saveDateTime="2022-09-16T01:54:00" version="3.26.3-Buenos Aires" saveUser="tim" projectname="Gun Run" saveUserFull="Timothy Allen">
+<qgis saveDateTime="2023-05-31T18:02:12" projectname="Gun Run" version="3.30.3-'s-Hertogenbosch" saveUserFull="Timothy Allen" saveUser="tim">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -17,273 +17,272 @@
       <geographicflag>true</geographicflag>
     </spatialrefsys>
   </projectCrs>
+  <elevation-shading-renderer edl-is-active="1" edl-distance-unit="0" light-azimuth="315" combined-method="0" edl-strength="1000" edl-distance="0.5" hillshading-is-active="0" is-active="0" hillshading-z-factor="1" light-altitude="45" hillshading-is-multidirectional="0"/>
   <layer-tree-group>
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Marshals">
+    <layer-tree-group name="Marshals" expanded="0" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="marshal_positions" source="./marshal_positions.shp|layername=marshal_positions" patch_size="0,0">
+      <layer-tree-layer name="marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" legend_exp="" patch_size="0,0" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="marshal_positions [456]" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option type="QString" value="" name="legend/expressionFilter"/>
-            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
-            <Option type="int" value="1" name="showFeatureCount"/>
+            <Option name="cached_name" value="marshal_positions [456]" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+            <Option name="showFeatureCount" value="1" type="int"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="extra_security20170921130834191" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="extra_security" source="./extra_security.shp" patch_size="0,0">
+      <layer-tree-layer name="extra_security" id="extra_security20170921130834191" expanded="1" legend_exp="" patch_size="0,0" source="./extra_security.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="extra_security" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" value="extra_security" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="marshals_by_position20161003112326575" providerKey="delimitedtext" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="marshals_by_position" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" patch_size="0,0">
+      <layer-tree-layer name="marshals_by_position" id="marshals_by_position20161003112326575" expanded="1" legend_exp="" patch_size="0,0" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="delimitedtext">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="marshals_by_position [457]" name="cached_name"/>
-            <Option type="int" value="1" name="showFeatureCount"/>
+            <Option name="cached_name" value="marshals_by_position [457]" type="QString"/>
+            <Option name="showFeatureCount" value="1" type="int"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="complete_marshal_overview" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" patch_size="0,0">
+      <layer-tree-layer name="complete_marshal_overview" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" expanded="1" legend_exp="" patch_size="0,0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="virtual">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="complete_marshal_overview" name="cached_name"/>
+            <Option name="cached_name" value="complete_marshal_overview" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="marshal_overviews" source="./marshal overviews.shp|layername=marshal overviews" patch_size="0,0">
+      <layer-tree-layer name="marshal_overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" expanded="0" legend_exp="" patch_size="0,0" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="marshal_overviews" name="cached_name"/>
-            <Option type="QString" value="" name="legend/expressionFilter"/>
-            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
+            <Option name="cached_name" value="marshal_overviews" type="QString"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Unchecked" groupLayer="" name="Fencing and Cones">
+    <layer-tree-group name="Fencing and Cones" expanded="0" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="fencing" source="./fencing.shp|layername=fencing" patch_size="0,0">
+      <layer-tree-layer name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_exp="" patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="fencing" name="cached_name"/>
-            <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
-            <Option type="QString" value="" name="legend/expressionFilter"/>
-            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
+            <Option name="cached_name" value="fencing" type="QString"/>
+            <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" providerKey="virtual" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="cone_only_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" patch_size="-1,-1">
+      <layer-tree-layer name="cone_only_groups" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" expanded="1" legend_exp="" 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" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="virtual">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="cone_only_groups" name="cached_name"/>
+            <Option name="cached_name" value="cone_only_groups" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" providerKey="virtual" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="fence_and_cone_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" patch_size="-1,-1">
+      <layer-tree-layer name="fence_and_cone_groups" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" expanded="1" legend_exp="" 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" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="virtual">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="fence_and_cone_groups" name="cached_name"/>
+            <Option name="cached_name" value="fence_and_cone_groups" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+    <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Markers">
+      <layer-tree-group name="Markers" expanded="1" checked="Qt::Checked" groupLayer="">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" providerKey="memory" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="route_markers" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={11ed0f81-3f12-40bd-8e45-084ec6d28146}" patch_size="-1,-1">
+        <layer-tree-layer name="route_markers" id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" expanded="1" legend_exp="" patch_size="-1,-1" source="Point?crs=EPSG:4326&amp;uid={98f1cf95-2d66-4e2b-ab42-5f814aa62a83}" checked="Qt::Checked" legend_split_behavior="0" providerKey="memory">
           <customproperties>
             <Option type="Map">
-              <Option type="QString" value="route_markers [57]" name="cached_name"/>
-              <Option name="expandedLegendNodes"/>
-              <Option type="int" value="1" name="showFeatureCount"/>
+              <Option name="showFeatureCount" value="1" type="int"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="all_routes" source="./all_routes.shp|layername=all_routes" patch_size="0,0">
+      <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="all_routes" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option type="int" value="0" name="showFeatureCount"/>
+            <Option name="cached_name" value="all_routes" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" value="0" type="int"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer expanded="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="timelapse" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " patch_size="0,0">
+    <layer-tree-layer name="timelapse" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" expanded="0" legend_exp="" 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' " checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="timelapse" name="cached_name"/>
+          <Option name="cached_name" value="timelapse" type="QString"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Feeding Stations">
+    <layer-tree-group name="Feeding Stations" expanded="1" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="1" id="water_tables20170921142016467" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="water_tables" source="./water_tables.shp" patch_size="0,0">
+      <layer-tree-layer name="water_tables" id="water_tables20170921142016467" expanded="1" legend_exp="" patch_size="0,0" source="./water_tables.shp" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="water_tables" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
+            <Option name="cached_name" value="water_tables" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Ask Me">
+    <layer-tree-group name="Ask Me" expanded="0" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="poi_labels" source="./poi_labels.shp|layername=poi_labels" patch_size="0,0">
+      <layer-tree-layer name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" legend_exp="" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="poi_labels" name="cached_name"/>
+            <Option name="cached_name" value="poi_labels" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start" patch_size="0,0">
+      <layer-tree-layer name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" legend_exp="" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="directions_to_start" name="cached_name"/>
+            <Option name="cached_name" value="directions_to_start" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Residents Access">
+    <layer-tree-group name="Residents Access" expanded="0" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="mayor" source="./mayor.shp" patch_size="0,0">
+      <layer-tree-layer name="mayor" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" expanded="1" legend_exp="" patch_size="0,0" source="./mayor.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="mayor" name="cached_name"/>
+            <Option name="cached_name" value="mayor" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="viplabels" source="./viplabels.shp" patch_size="0,0">
+      <layer-tree-layer name="viplabels" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" expanded="1" legend_exp="" patch_size="0,0" source="./viplabels.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="viplabels" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" value="viplabels" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="vipaccess" source="./vipaccess.shp" patch_size="0,0">
+      <layer-tree-layer name="vipaccess" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" expanded="1" legend_exp="" patch_size="0,0" source="./vipaccess.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="vipaccess" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" value="vipaccess" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="golfaccess" source="./golfaccess.shp" patch_size="0,0">
+      <layer-tree-layer name="golfaccess" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" expanded="0" legend_exp="" patch_size="0,0" source="./golfaccess.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads" patch_size="0,0">
+      <layer-tree-layer name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" legend_exp="" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="residents_access_roads" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" value="residents_access_roads" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="residents_access" source="./residents_access.shp|layername=residents_access" patch_size="0,0">
+      <layer-tree-layer name="residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" expanded="1" legend_exp="" patch_size="0,0" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="OSM data">
+    <layer-tree-group name="OSM data" expanded="1" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="osm_roads" source="./osm_roads.shp" patch_size="0,0">
+      <layer-tree-layer name="osm_roads" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" legend_exp="" patch_size="0,0" source="./osm_roads.shp" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="osm_roads [3887]" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option type="QString" value="1" name="showFeatureCount"/>
+            <Option name="cached_name" value="osm_roads [3887]" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="osm_places" source="./osm_places.shp|layername=osm_places" patch_size="0,0">
+      <layer-tree-layer name="osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" legend_exp="" patch_size="0,0" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="osm_places [7]" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option type="QString" value="1" name="showFeatureCount"/>
+            <Option name="cached_name" value="osm_places [7]" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Unchecked" groupLayer="" name="Start and Finish pages">
+    <layer-tree-group name="Start and Finish pages" expanded="1" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="data-comments" source="./data-comments.shp" patch_size="0,0">
+      <layer-tree-layer name="data-comments" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" expanded="1" legend_exp="" patch_size="0,0" source="./data-comments.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="data-comments" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" value="data-comments" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="start_finish_area" source="./start_finish_area.shp" patch_size="0,0">
+      <layer-tree-layer name="start_finish_area" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" expanded="1" legend_exp="" patch_size="0,0" source="./start_finish_area.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="start_finish_area" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" value="start_finish_area" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Elevation">
+    <layer-tree-group name="Elevation" expanded="0" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="capetownelevation-1m" source="./capetownelevation-1m.shp" patch_size="0,0">
+      <layer-tree-layer name="capetownelevation-1m" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" expanded="1" legend_exp="" patch_size="0,0" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="1" name="showFeatureCount"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Map">
+    <layer-tree-group name="Map" expanded="1" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="GDAL-City of Cape Town 2015 Aerial" source="./GDAL-City of Cape Town 2015 Aerial.xml" patch_size="0,0">
+      <layer-tree-layer name="GDAL-City of Cape Town 2015 Aerial" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" legend_exp="" patch_size="0,0" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="gdal">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="GDAL-City of Cape Town 2015 Aerial" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
+            <Option name="cached_name" value="GDAL-City of Cape Town 2015 Aerial" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="Outlines" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" patch_size="0,0">
+      <layer-tree-layer name="Outlines" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" legend_exp="" 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" checked="Qt::Checked" legend_split_behavior="0" providerKey="wms">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="Outlines" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
+            <Option name="cached_name" value="Outlines" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -314,46 +313,46 @@
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
       <item>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</item>
       <item>cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a</item>
-      <item>route_markers_21122a5c_9be9_458c_9d62_573685055e1c</item>
+      <item>route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings maxScale="0" tolerance="10" self-snapping="1" type="1" intersection-snapping="1" mode="3" minScale="0" unit="1" scaleDependencyMode="0" enabled="1">
+  <snapping-settings tolerance="10" scaleDependencyMode="0" mode="3" self-snapping="1" maxScale="0" type="1" enabled="0" intersection-snapping="1" unit="1" minScale="0">
     <individual-layer-settings>
-      <layer-setting maxScale="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" type="2" units="1" minScale="0" enabled="1"/>
-      <layer-setting maxScale="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" type="1" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="water_tables20170921142016467" tolerance="0" type="2" units="2" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" tolerance="12" type="0" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" tolerance="12" type="0" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" type="1" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" tolerance="12" type="0" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" type="1" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" type="1" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="extra_security20170921130834191" tolerance="0" type="2" units="2" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="2" tolerance="0" id="extra_security20170921130834191" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" maxScale="0" type="1" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" maxScale="0" type="1" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" maxScale="0" type="1" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" maxScale="0" type="1" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" maxScale="0" type="0" enabled="0" minScale="0"/>
+      <layer-setting units="2" tolerance="0" id="water_tables20170921142016467" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" maxScale="0" type="1" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" maxScale="0" type="2" enabled="1" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" maxScale="0" type="0" enabled="0" minScale="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
   <polymorphicRelations/>
-  <mapcanvas annotationsVisible="1" name="theMapCanvas">
+  <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.40646932918750522</xmin>
-      <ymin>-33.90381339025915253</ymin>
-      <xmax>18.414601992524954</xmax>
-      <ymax>-33.8995522642739715</ymax>
+      <xmin>18.39262360336048019</xmin>
+      <ymin>-33.91377785181562388</ymin>
+      <xmax>18.42086732654766834</xmax>
+      <ymax>-33.89897949390747556</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -374,166 +373,166 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="true" checked="Qt::Checked" name="Marshals">
-      <legendlayer open="true" checked="Qt::Checked" showFeatureCount="1" drawingOrder="-1" name="marshal_positions">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0" visible="1"/>
+    <legendgroup open="false" name="Marshals" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" open="true" name="marshal_positions" showFeatureCount="1" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="extra_security">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="extra_security20170921130834191" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="extra_security" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="1" drawingOrder="-1" name="marshals_by_position">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="marshals_by_position20161003112326575" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="marshals_by_position" showFeatureCount="1" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="complete_marshal_overview">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="complete_marshal_overview" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="marshal_overviews">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="false" name="marshal_overviews" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Unchecked" name="Fencing and Cones">
-      <legendlayer open="true" checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" name="fencing">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="0"/>
+    <legendgroup open="false" name="Fencing and Cones" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" open="true" name="fencing" showFeatureCount="0" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="cone_only_groups">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="cone_only_groups" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="fence_and_cone_groups">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="fence_and_cone_groups" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Routes">
-      <legendgroup open="true" checked="Qt::Checked" name="Markers">
-        <legendlayer open="true" checked="Qt::Checked" showFeatureCount="1" drawingOrder="-1" name="route_markers">
-          <filegroup hidden="false" open="true">
-            <legendlayerfile layerid="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" isInOverview="0" visible="1"/>
+    <legendgroup open="true" name="Routes" checked="Qt::Checked">
+      <legendgroup open="true" name="Markers" checked="Qt::Checked">
+        <legendlayer drawingOrder="-1" open="true" name="route_markers" showFeatureCount="1" checked="Qt::Checked">
+          <filegroup open="true" hidden="false">
+            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer open="true" checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" name="all_routes">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0" visible="1"/>
+      <legendlayer drawingOrder="-1" open="true" name="all_routes" showFeatureCount="0" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer open="false" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="timelapse">
-      <filegroup hidden="false" open="false">
-        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0" visible="0"/>
+    <legendlayer drawingOrder="-1" open="false" name="timelapse" showFeatureCount="0" checked="Qt::Unchecked">
+      <filegroup open="false" hidden="false">
+        <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" checked="Qt::Checked" name="Feeding Stations">
-      <legendlayer open="true" checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" name="water_tables">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="1"/>
+    <legendgroup open="true" name="Feeding Stations" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" open="true" name="water_tables" showFeatureCount="0" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Ask Me">
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="poi_labels">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0" visible="0"/>
+    <legendgroup open="false" name="Ask Me" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" open="true" name="poi_labels" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="directions_to_start">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="directions_to_start" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Residents Access">
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="mayor">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0" visible="0"/>
+    <legendgroup open="false" name="Residents Access" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" open="true" name="mayor" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="viplabels">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="viplabels" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="vipaccess">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="vipaccess" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="golfaccess">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="false" name="golfaccess" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="residents_access_roads">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="residents_access_roads" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="residents_access">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="residents_access" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="OSM data">
-      <legendlayer open="false" checked="Qt::Checked" showFeatureCount="1" drawingOrder="-1" name="osm_roads">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0" visible="1"/>
+    <legendgroup open="true" name="OSM data" checked="Qt::Checked">
+      <legendlayer drawingOrder="-1" open="false" name="osm_roads" showFeatureCount="1" checked="Qt::Checked">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Checked" showFeatureCount="1" drawingOrder="-1" name="osm_places">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0" visible="1"/>
+      <legendlayer drawingOrder="-1" open="true" name="osm_places" showFeatureCount="1" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Unchecked" name="Start and Finish pages">
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="data-comments">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0" visible="0"/>
+    <legendgroup open="true" name="Start and Finish pages" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" open="true" name="data-comments" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="start_finish_area">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="start_finish_area" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Elevation">
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="1" drawingOrder="-1" name="capetownelevation-1m">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0" visible="0"/>
+    <legendgroup open="false" name="Elevation" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" open="true" name="capetownelevation-1m" showFeatureCount="1" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Map">
-      <legendlayer open="false" checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="1"/>
+    <legendgroup open="true" name="Map" checked="Qt::Checked">
+      <legendlayer drawingOrder="-1" open="false" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" name="Outlines">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0" visible="1"/>
+      <legendlayer drawingOrder="-1" open="true" name="Outlines" showFeatureCount="0" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer legendPlaceholderImage="" autoRefreshTime="0" type="annotation" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="">
+  <main-annotation-layer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="annotation" autoRefreshTime="0" refreshOnNotifyMessage="" minScale="0">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -561,6 +560,7 @@
       <title></title>
       <abstract></abstract>
       <links/>
+      <dates/>
       <fees></fees>
       <encoding></encoding>
       <crs>
@@ -579,12 +579,21 @@
       <extent/>
     </resourceMetadata>
     <items/>
+    <flags>
+      <Identifiable>1</Identifiable>
+      <Removable>1</Removable>
+      <Searchable>1</Searchable>
+      <Private>0</Private>
+    </flags>
+    <customproperties>
+      <Option/>
+    </customproperties>
     <layerOpacity>1</layerOpacity>
     <blendMode>0</blendMode>
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" type="raster" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" minScale="1e+08" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="">
+    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="raster" autoRefreshTime="0" refreshOnNotifyMessage="" minScale="1e+08">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -633,6 +642,7 @@
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -649,7 +659,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -660,9 +670,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
-        <noDataList useSrcNoData="0" bandNo="2"/>
-        <noDataList useSrcNoData="0" bandNo="3"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList bandNo="2" useSrcNoData="0"/>
+        <noDataList bandNo="3" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -680,129 +690,91 @@
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" zoffset="0" band="1" zscale="1" enabled="0">
+      <elevation band="1" zoffset="0" symbology="Line" enabled="0" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="152,125,183,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="152,125,183,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="152,125,183,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{31a148a7-0364-430a-b534-21f418a5bb1b}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="152,125,183,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="152,125,183,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="152,125,183,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -811,27 +783,28 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="no_action" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="false" name="WMSBackgroundLayer"/>
-          <Option type="QString" value="false" name="WMSPublishDataSourceUrl"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="QString" value="Value" name="identify/format"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="WMSBackgroundLayer" value="false" type="QString"/>
+          <Option name="WMSPublishDataSourceUrl" value="false" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="identify/format" value="Value" type="QString"/>
         </Option>
       </customproperties>
+      <mapTip></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option type="QString" value="" name="name"/>
+          <Option name="name" value="" type="QString"/>
           <Option name="properties"/>
-          <Option type="QString" value="collection" name="type"/>
+          <Option name="type" value="collection" type="QString"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer redBand="1" opacity="0.5" type="multibandcolor" nodataColor="" greenBand="2" blueBand="3" alphaBand="-1">
+        <rasterrenderer opacity="0.5" alphaBand="-1" blueBand="3" redBand="1" greenBand="2" type="multibandcolor" nodataColor="">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -842,14 +815,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
-        <huesaturation saturation="0" invertColors="0" colorizeOn="0" colorizeGreen="128" colorizeBlue="128" grayscaleMode="0" colorizeStrength="100" colorizeRed="255"/>
+        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
+        <huesaturation saturation="0" grayscaleMode="0" colorizeStrength="100" invertColors="0" colorizeGreen="128" colorizeBlue="128" colorizeRed="255" colorizeOn="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" type="raster" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" minScale="1e+08" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="">
+    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="raster" autoRefreshTime="0" refreshOnNotifyMessage="" minScale="1e+08">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -898,6 +871,7 @@
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -914,7 +888,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -925,7 +899,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -943,129 +917,91 @@
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" zoffset="0" band="1" zscale="1" enabled="0">
+      <elevation band="1" zoffset="0" symbology="Line" enabled="0" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="225,89,137,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="225,89,137,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="225,89,137,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="225,89,137,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="225,89,137,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="225,89,137,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1074,27 +1010,28 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="no_action" name="QFieldSync/action"/>
-          <Option type="QString" value="no_action" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="true" name="WMSBackgroundLayer"/>
-          <Option type="QString" value="false" name="WMSPublishDataSourceUrl"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="QString" value="Undefined" name="identify/format"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="WMSBackgroundLayer" value="true" type="QString"/>
+          <Option name="WMSPublishDataSourceUrl" value="false" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="identify/format" value="Undefined" type="QString"/>
         </Option>
       </customproperties>
+      <mapTip></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option type="QString" value="" name="name"/>
+          <Option name="name" value="" type="QString"/>
           <Option name="properties"/>
-          <Option type="QString" value="collection" name="type"/>
+          <Option name="type" value="collection" type="QString"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer opacity="0.75" band="1" type="singlebandcolordata" nodataColor="" alphaBand="-1">
+        <rasterrenderer band="1" opacity="0.75" alphaBand="-1" type="singlebandcolordata" nodataColor="">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1105,14 +1042,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
-        <huesaturation saturation="0" invertColors="0" colorizeOn="0" colorizeGreen="128" colorizeBlue="128" grayscaleMode="0" colorizeStrength="100" colorizeRed="255"/>
+        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
+        <huesaturation saturation="0" grayscaleMode="0" colorizeStrength="100" invertColors="0" colorizeGreen="128" colorizeBlue="128" colorizeRed="255" colorizeOn="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1161,23 +1098,24 @@
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1191,8 +1129,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="$length * 100" precision="0" name="length_km"/>
-        <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="$length * 100 * 1000" precision="0" name="length_m"/>
+        <field name="length_km" expression="$length * 100" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="length_m" expression="$length * 100 * 1000" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1205,360 +1143,264 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="RouteLen" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="RouteLen" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{14a5ec6d-a9d2-4221-909d-48fa947966db}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="229,182,54,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="229,182,54,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="229,182,54,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="229,182,54,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="164,130,39,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="229,182,54,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="164,130,39,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="229,182,54,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="164,130,39,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{2821b303-e942-4f2b-95eb-71ba37854d84}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="229,182,54,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="164,130,39,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="229,182,54,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="164,130,39,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="229,182,54,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="164,130,39,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" description="Only show when active in Atlas" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" label="Show by day">
-            <rule symbol="1" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" label="21KM"/>
-            <rule symbol="2" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" label="10KM"/>
-            <rule symbol="3" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '5KM'" key="{871a9276-8278-4528-911c-7e434c0885d3}" label="5KM"/>
-            <rule symbol="4" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" label="Trail"/>
+          <rule description="Only show when active in Atlas" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" symbol="0" label="Show by day">
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="1" label="21KM" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="2" label="10KM" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '5KM'" key="{871a9276-8278-4528-911c-7e434c0885d3}" symbol="3" label="5KM" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" symbol="4" label="Trail" checkstate="0"/>
           </rule>
-          <rule symbol="5" checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" label="Always show"/>
-          <rule symbol="6" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" label="Always show by day"/>
+          <rule key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" symbol="5" label="Always show" checkstate="0"/>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" symbol="6" label="Always show by day" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="500" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="250" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@0@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{c07399ea-beb4-4328-8240-a80a1288dc13}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="0,0,0,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MapUnit" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@0@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@0@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{375106d8-ffb9-4433-8f42-bd7727c23e58}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="0,0,0,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="0,0,0,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option 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" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1566,444 +1408,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.5" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN 'dash'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN 'dash'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{1c6ea3ad-b426-4646-b786-88c35d759f75}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@0@2" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@0@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{f29062d5-8f7a-49df-a456-af79ffadebeb}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="0,0,0,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="true" name="active"/>
-                          <Option 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" name="expression"/>
-                          <Option type="int" value="3" name="type"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                          <Option name="type" value="3" type="int"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="FirstVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="FirstVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@0@3" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@0@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{3d683642-1e02-4313-ae66-4b398724d7bc}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="0,0,0,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="true" name="active"/>
-                          <Option 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" name="expression"/>
-                          <Option type="int" value="3" name="type"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                          <Option name="type" value="3" type="int"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="1" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{d9268524-45f1-4731-945d-c43780c8de62}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="500" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="250" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@1@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="210,32,39,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MapUnit" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="1" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="1" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="1" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@1@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@1@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="210,32,39,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="210,32,39,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="210,32,39,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2011,444 +1717,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="210,32,39,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.25" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="210,32,39,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.25" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="210,32,39,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.25" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{903df944-a62b-4e12-b3c3-dd56eb016c50}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@1@2" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@1@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="210,32,39,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="FirstVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="FirstVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@1@3" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@1@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{64671b77-2f8b-408e-a6d3-7d9156b47449}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="210,32,39,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="2" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="500" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="250" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@2@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@2@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="103,34,144,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MapUnit" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@2@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@2@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="103,34,144,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2456,444 +2026,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="103,34,144,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.5" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@2@2" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@2@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{3be01cea-3561-46b3-874e-2f8b60b1d683}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="103,34,144,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{88220b0d-a48b-45b5-aad8-3b42c6069888}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="FirstVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="FirstVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@2@3" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@2@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="103,34,144,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="3" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="3" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="500" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="250" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@3@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@3@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="145,211,55,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MapUnit" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@3@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@3@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="145,211,55,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="145,211,55,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="145,211,55,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2901,444 +2335,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="145,211,55,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.5" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="145,211,55,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="145,211,55,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{09613930-5415-4f16-9126-06282c6e8ebe}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@3@2" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@3@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="145,211,55,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="FirstVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="FirstVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@3@3" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@3@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="145,211,55,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="4" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="4" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="500" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="250" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@4@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@4@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="0,72,255,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MapUnit" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="0,72,255,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@4@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@4@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="0,72,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,72,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="0,72,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3346,453 +2644,302 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,72,255,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.5" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,72,255,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,72,255,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{536a9089-88ae-403e-a80e-164ca63e1aee}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@4@2" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@4@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{8f58777c-0c60-41db-9b75-06624dc32b3c}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="0,72,255,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="0,72,255,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="FirstVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="FirstVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@4@3" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@4@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="0,72,255,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="0,72,255,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="5" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="5" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.26" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="6" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="6" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.46" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.46" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3803,199 +2950,335 @@
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{fd09a5be-3328-4f5f-a802-aaa9365e22cb}">
-          <rule description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" key="{83b529c4-ab23-4e8f-8099-3d7728e2b8fa}">
+        <rules key="{1e5906eb-3293-40e6-9693-aecca72e6ace}">
+          <rule description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{e8bc2eb1-ef27-4acd-94dc-f5f5984aa9dc}" active="0">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="255,255,255,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="round($length / 1000, 0)" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round($length / 1000, 0)" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="1" shapeOffsetY="0" shapeSizeX="1">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="164,113,88,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="164,113,88,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="164,113,88,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="0,0,0,255" name="color"/>
-                        <Option type="QString" value="round" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="1" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="0,0,0,255" k="color"/>
-                      <prop v="round" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="1" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option 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" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option 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" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="km_marker()" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="LineGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="1" quadOffset="3" placement="0" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="1" polygonPlacementFlags="2" geometryGenerator="km_marker()" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="quadrant" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="quadrant" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="field" value="rotation" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <rule description="Route lengths" key="{42dd1aec-3e48-4dbd-b22f-b4960bd4f8d2}" active="0">
+            <settings calloutType="simple">
+              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100, 4 )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+                <families/>
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                      <Option type="Map">
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="164,113,88,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties"/>
+                          <Option name="type" value="collection" type="QString"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                      <Option type="Map">
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
+                            </Option>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
+                            </Option>
+                          </Option>
+                          <Option name="type" value="collection" type="QString"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties"/>
+                    <Option name="type" value="collection" type="QString"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="km_marker()" overlapHandling="AllowOverlapAtNoCost" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="50" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
+                    </Option>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
+                    </Option>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="quadrant" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
+                    </Option>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="field" value="rotation" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
+                    </Option>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
+                    </Option>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
+                    </Option>
+                  </Option>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties"/>
+                    <Option name="type" value="collection" type="QString"/>
+                  </Option>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -4004,101 +3287,75 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="100000" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{99bd229d-7319-436f-b616-1be11812c381}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -4106,16 +3363,16 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="2" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4126,8 +3383,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4136,8 +3393,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4146,8 +3403,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4156,8 +3413,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4166,8 +3423,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4176,8 +3433,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4186,8 +3443,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4196,8 +3453,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4220,8 +3477,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4230,8 +3487,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4251,70 +3508,84 @@
         <alias field="length_km" index="10" name=""/>
         <alias field="length_m" index="11" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="Name"/>
+        <policy policy="Duplicate" field="descriptio"/>
+        <policy policy="Duplicate" field="timestamp"/>
+        <policy policy="Duplicate" field="begin"/>
+        <policy policy="Duplicate" field="end"/>
+        <policy policy="Duplicate" field="Distance"/>
+        <policy policy="Duplicate" field="RouteLen"/>
+        <policy policy="Duplicate" field="Source"/>
+        <policy policy="Duplicate" field="Sort"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="length_km"/>
+        <policy policy="Duplicate" field="length_m"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="Sort"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="Name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="descriptio" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="timestamp" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="begin" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="end" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Distance" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="RouteLen" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Source" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Sort" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="length_km" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="length_m" exp_strength="0"/>
+        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Sort" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="Sort"/>
-        <constraint desc="" exp="" field="day"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="length_m"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="Sort" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="$length * 100" precision="0" name="length_km"/>
-        <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="$length * 100 * 1000" precision="0" name="length_m"/>
+        <field name="length_km" expression="$length * 100" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="length_m" expression="$length * 100 * 1000" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;length_m&quot;" sortOrder="1">
+      <attributetableconfig sortExpression="&quot;length_m&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="152" name="Name"/>
-          <column hidden="0" type="field" width="-1" name="descriptio"/>
-          <column hidden="0" type="field" width="-1" name="timestamp"/>
-          <column hidden="0" type="field" width="163" name="begin"/>
-          <column hidden="0" type="field" width="-1" name="end"/>
-          <column hidden="0" type="field" width="-1" name="Distance"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="RouteLen"/>
-          <column hidden="0" type="field" width="-1" name="Source"/>
-          <column hidden="0" type="field" width="188" name="length_m"/>
-          <column hidden="0" type="field" width="-1" name="Sort"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
-          <column hidden="0" type="field" width="266" name="length_km"/>
+          <column name="Name" width="152" type="field" hidden="0"/>
+          <column name="descriptio" width="-1" type="field" hidden="0"/>
+          <column name="timestamp" width="-1" type="field" hidden="0"/>
+          <column name="begin" width="163" type="field" hidden="0"/>
+          <column name="end" width="-1" type="field" hidden="0"/>
+          <column name="Distance" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="RouteLen" width="-1" type="field" hidden="0"/>
+          <column name="Source" width="-1" type="field" hidden="0"/>
+          <column name="length_m" width="188" type="field" hidden="0"/>
+          <column name="Sort" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="length_km" width="266" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4346,53 +3617,53 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Sort"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="0" name="length_km"/>
-        <field editable="0" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="0"/>
+        <field name="length_m" editable="0"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Sort"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Sort" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="Distance"/>
-        <field reuseLastValue="0" name="Name"/>
-        <field reuseLastValue="0" name="RouteLen"/>
-        <field reuseLastValue="0" name="Sort"/>
-        <field reuseLastValue="0" name="Source"/>
-        <field reuseLastValue="0" name="begin"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="descriptio"/>
-        <field reuseLastValue="0" name="end"/>
-        <field reuseLastValue="0" name="length_km"/>
-        <field reuseLastValue="0" name="length_m"/>
-        <field reuseLastValue="0" name="timestamp"/>
+        <field name="Distance" reuseLastValue="0"/>
+        <field name="Name" reuseLastValue="0"/>
+        <field name="RouteLen" reuseLastValue="0"/>
+        <field name="Sort" reuseLastValue="0"/>
+        <field name="Source" reuseLastValue="0"/>
+        <field name="begin" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="descriptio" reuseLastValue="0"/>
+        <field name="end" reuseLastValue="0"/>
+        <field name="length_km" reuseLastValue="0"/>
+        <field name="length_m" reuseLastValue="0"/>
+        <field name="timestamp" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -4432,18 +3703,19 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
@@ -4465,273 +3737,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="196,60,57,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="196,60,57,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="196,60,57,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="196,60,57,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="140,43,41,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="196,60,57,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="140,43,41,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="196,60,57,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="140,43,41,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{53b6bbaf-4722-434f-a142-936b95477967}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="196,60,57,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="140,43,41,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="196,60,57,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="140,43,41,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="196,60,57,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="140,43,41,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="183,72,75,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.26" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="183,72,75,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="183,72,75,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4742,15 +3930,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4784,26 +3972,31 @@ def my_form_open(dialog, layer, feature):
         <alias field="height" index="1" name=""/>
         <alias field="elevation" index="2" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="ID"/>
+        <policy policy="Duplicate" field="height"/>
+        <policy policy="Duplicate" field="elevation"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="ID"/>
-        <default applyOnUpdate="0" expression="" field="height"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="ID" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="height" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="elevation" exp_strength="0"/>
+        <constraint unique_strength="0" field="ID" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="height" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="elevation" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="ID"/>
-        <constraint desc="" exp="" field="height"/>
-        <constraint desc="" exp="" field="elevation"/>
+        <constraint field="ID" exp="" desc=""/>
+        <constraint field="height" exp="" desc=""/>
+        <constraint field="elevation" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4826,7 +4019,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="Polygon" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" styleCategories="AllStyleCategories">
+    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Polygon" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -4866,6 +4059,7 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -4901,241 +4095,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="133,182,111,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="133,182,111,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="133,182,111,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="133,182,111,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="95,130,79,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="133,182,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="95,130,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="133,182,111,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="95,130,79,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{1880865e-e5e1-4936-8c97-9d2a6866e812}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="133,182,111,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="95,130,79,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="133,182,111,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="95,130,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="133,182,111,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="95,130,79,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="225,89,137,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="225,89,137,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="225,89,137,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5146,17 +4272,17 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="no_action" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
         </Option>
       </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=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -5198,29 +4324,35 @@ def my_form_open(dialog, layer, feature):
         <alias field="page" index="2" name=""/>
         <alias field="day" index="3" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="page"/>
+        <policy policy="Duplicate" field="day"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="page"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="page" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="page" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="page"/>
-        <constraint desc="" exp="" field="day"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="page" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -5243,7 +4375,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="Polygon" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" styleCategories="AllStyleCategories">
+    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Polygon" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -5283,6 +4415,7 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -5318,241 +4451,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="243,166,178,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="243,166,178,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="243,166,178,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{9fd55fce-62b5-4989-a948-622d8a60e362}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="243,166,178,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="174,119,127,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="243,166,178,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="174,119,127,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="243,166,178,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="174,119,127,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="243,166,178,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="174,119,127,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="243,166,178,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="174,119,127,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="243,166,178,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="174,119,127,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="114,155,111,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="38,162,105,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="f_diagonal" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="114,155,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="38,162,105,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="f_diagonal" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="114,155,111,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="38,162,105,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="f_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5563,92 +4628,65 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="&quot;name&quot;"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="&quot;name&quot;" type="QString"/>
           </Option>
-          <Option type="int" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="int"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="5" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="1" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" bold="0" italic="0" style="0" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="5" enabled="0" showAxis="1" opacity="1" penWidth="0" penColor="#000000" direction="0" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" italic="0" underline="0" style="0" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5656,22 +4694,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="1" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="1" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </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" value="0" name="allowedGapsBuffer"/>
-            <Option type="bool" value="false" name="allowedGapsEnabled"/>
-            <Option type="QString" value="" name="allowedGapsLayer"/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -5721,39 +4759,46 @@ def my_form_open(dialog, layer, feature):
         <alias field="day" index="3" name=""/>
         <alias field="cone_len" index="4" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="name"/>
+        <policy policy="Duplicate" field="group"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="cone_len"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="group" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="cone_len" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="group"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="day"/>
-        <constraint desc="" exp="" field="cone_len"/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="group" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
+        <constraint field="cone_len" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="306" name="name"/>
-          <column hidden="0" type="field" width="-1" name="group"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
-          <column hidden="0" type="field" width="-1" name="cone_len"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column name="name" width="306" type="field" hidden="0"/>
+          <column name="group" width="-1" type="field" hidden="0"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="cone_len" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5785,32 +4830,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="cone_len"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="cone_len" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -5859,23 +4904,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5900,273 +4946,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="190,178,151,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="190,178,151,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="190,178,151,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="190,178,151,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="136,127,108,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="190,178,151,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,127,108,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="190,178,151,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="136,127,108,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="190,178,151,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="136,127,108,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="190,178,151,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,127,108,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="190,178,151,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="136,127,108,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,85,255,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="1" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,85,255,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,85,255,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6177,189 +5139,151 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="Name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="Name" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-          <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MM" priority="5" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="LineGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="2" offsetType="0" centroidWhole="0" allowDegraded="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2"/>
-          <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="LineGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+          <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-              <Option type="int" value="0" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-              <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-              <Option type="double" value="0" name="minLength"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-              <Option type="QString" value="MM" name="minLengthUnit"/>
-              <Option type="double" value="0" name="offsetFromAnchor"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-              <Option type="double" value="0" name="offsetFromLabel"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="Name" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="Name" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6367,16 +5291,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6402,27 +5326,31 @@ def my_form_open(dialog, layer, feature):
         <alias field="id" index="0" name=""/>
         <alias field="Name" index="1" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="Name"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="Name" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Name" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="Name"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="Name" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="Name"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="Name" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6454,12 +5382,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="id"/>
+        <field name="Name" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="id"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -6467,7 +5395,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -6516,23 +5444,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6557,450 +5486,319 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{648e55d2-e73b-45b7-bf24-689efea25f17}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="145,82,45,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="145,82,45,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="145,82,45,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="145,82,45,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="104,59,32,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="145,82,45,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="104,59,32,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="145,82,45,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="104,59,32,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{f8afb303-1e69-416a-9c9b-55ed02b33766}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="145,82,45,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="104,59,32,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="145,82,45,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="104,59,32,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="145,82,45,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="104,59,32,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" description="Only show when active in Atlas" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" label="21KM"/>
-          <rule symbol="1" description="Only show when active in Atlas" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" label="10KM"/>
-          <rule symbol="2" description="Only show when active in Atlas" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" label="5KM"/>
+          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" symbol="0" label="21KM"/>
+          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" symbol="1" label="10KM"/>
+          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" symbol="2" label="5KM"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@0@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{a6a584bd-d0ac-4682-949e-960321bee388}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="210,32,39,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="miter" name="joinstyle"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="210,32,39,255" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0.5" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="area" name="scale_method"/>
-                    <Option type="QString" value="3" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="miter" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="210,32,39,255" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0.5" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="area" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="miter" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="210,32,39,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0.5" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="250" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="100" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="100" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@0@1" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@0@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="210,32,39,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MapUnit" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="3" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@0@1@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@0@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{2967078f-5e58-40bd-b0c8-aabffd928676}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="210,32,39,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
-                        <Option type="QString" value="no" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="210,32,39,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="26,0,201,0" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="210,32,39,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -7008,213 +5806,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="flat" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="210,32,39,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.75" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="210,32,39,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="210,32,39,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="1" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{eab0a889-d082-476e-b081-a39cd87a440e}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="500" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@1@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{8af4d1dd-523c-4887-a603-8238496f1e2c}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="103,34,144,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="3" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@1@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@1@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{c53a1ec5-544c-48d2-961a-03466d491afc}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="103,34,144,255" name="color"/>
-                        <Option type="QString" value="miter" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="103,34,144,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.5" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="miter" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="103,34,144,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.5" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="103,34,144,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.5" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -7222,139 +5954,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="250" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="100" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="100" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@1@1" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="103,34,144,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="3" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@1@1@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{43e5e783-9402-4471-b264-9b43c9035744}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="103,34,144,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
-                        <Option type="QString" value="no" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="26,0,201,0" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -7362,213 +6055,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{9ffea0b4-4940-4dcf-9553-865b28a97639}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="flat" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="103,34,144,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.75" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="2" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="500" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@2@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@2@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="69,100,25,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MapUnit" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="3" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="69,100,25,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="69,100,25,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@2@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@2@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="69,100,25,255" name="color"/>
-                        <Option type="QString" value="miter" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="69,100,25,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.5" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="69,100,25,255" type="QString"/>
+                        <Option name="joinstyle" value="miter" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="69,100,25,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.5" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="69,100,25,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="69,100,25,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.5" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -7576,139 +6203,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{579d1121-5712-48ef-b839-b461ebde82d6}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="250" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="100" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="100" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@2@1" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@2@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="69,100,25,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MapUnit" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="3" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="69,100,25,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="69,100,25,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@2@1@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@2@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="69,100,25,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
-                        <Option type="QString" value="no" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="69,100,25,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="26,0,201,0" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="69,100,25,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -7716,68 +6304,41 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="flat" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="69,100,25,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.75" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="69,100,25,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="69,100,25,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7789,93 +6350,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="100000" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7883,16 +6417,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="2" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7910,8 +6444,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -7921,27 +6455,31 @@ def my_form_open(dialog, layer, feature):
         <alias field="id" index="0" name=""/>
         <alias field="Distance" index="1" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="Distance"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Distance" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="Distance"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="Distance"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="id"/>
+          <column name="Distance" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7973,30 +6511,30 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -8004,7 +6542,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="Point" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" refreshOnNotifyMessage="" geometry="Point" styleCategories="AllStyleCategories">
+    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -8044,18 +6582,19 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
@@ -8077,263 +6616,187 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="125,139,143,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="125,139,143,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="125,139,143,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="125,139,143,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="89,99,102,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="89,99,102,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="125,139,143,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="89,99,102,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="125,139,143,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="89,99,102,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="89,99,102,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="125,139,143,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="89,99,102,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="0.796078">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="marker" alpha="0.796078" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="227,0,185,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="circle" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="1" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="227,0,185,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="1" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="227,0,185,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,0" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8346,288 +6809,266 @@ def my_form_open(dialog, layer, feature):
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
           <rule description="Show in marshal maps" filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="8" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="8" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeOffsetY="0" shapeSizeX="0.20000000000000001">
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.20000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.4" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.4" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.4" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="FontStyle">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="ObstacleFactor">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="ObstacleFactor" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="Priority">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="Priority" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="ZIndex">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="ZIndex" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="8" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="1" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="8" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="1" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="227,0,185,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" fontWordSpacing="0" textOrientation="horizontal" fontSize="4" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="4" textOrientation="horizontal" fontKerning="1" textColor="227,0,185,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.5" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeOffsetY="0" shapeSizeX="0">
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.1" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.1" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="FontStyle">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="0" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="2" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="2" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -8636,227 +7077,200 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="QString" value="false" name="labeling/addDirectionSymbol"/>
-          <Option type="QString" value="0" name="labeling/angleOffset"/>
-          <Option type="QString" value="0" name="labeling/blendMode"/>
-          <Option type="QString" value="0" name="labeling/bufferBlendMode"/>
-          <Option type="QString" value="255" name="labeling/bufferColorA"/>
-          <Option type="QString" value="255" name="labeling/bufferColorB"/>
-          <Option type="QString" value="255" name="labeling/bufferColorG"/>
-          <Option type="QString" value="255" name="labeling/bufferColorR"/>
-          <Option type="QString" value="false" name="labeling/bufferDraw"/>
-          <Option type="QString" value="64" name="labeling/bufferJoinStyle"/>
-          <Option type="QString" value="false" name="labeling/bufferNoFill"/>
-          <Option type="QString" value="1" name="labeling/bufferSize"/>
-          <Option type="QString" value="false" name="labeling/bufferSizeInMapUnits"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale"/>
-          <Option type="QString" value="0" name="labeling/bufferTransp"/>
-          <Option type="QString" value="false" name="labeling/centroidInside"/>
-          <Option type="QString" value="false" name="labeling/centroidWhole"/>
-          <Option type="QString" value="3" name="labeling/decimals"/>
-          <Option type="QString" value="false" name="labeling/displayAll"/>
-          <Option type="QString" value="0" name="labeling/dist"/>
-          <Option type="QString" value="false" name="labeling/distInMapUnits"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/distMapUnitScale"/>
-          <Option type="QString" value="false" name="labeling/drawLabels"/>
-          <Option type="QString" value="false" name="labeling/enabled"/>
-          <Option type="QString" value="position" name="labeling/fieldName"/>
-          <Option type="QString" value="false" name="labeling/fitInPolygonOnly"/>
-          <Option type="QString" value="0" name="labeling/fontCapitals"/>
-          <Option type="QString" value="Myriad Pro" name="labeling/fontFamily"/>
-          <Option type="QString" value="false" name="labeling/fontItalic"/>
-          <Option type="QString" value="0" name="labeling/fontLetterSpacing"/>
-          <Option type="QString" value="false" name="labeling/fontLimitPixelSize"/>
-          <Option type="QString" value="10000" name="labeling/fontMaxPixelSize"/>
-          <Option type="QString" value="3" name="labeling/fontMinPixelSize"/>
-          <Option type="QString" value="10" name="labeling/fontSize"/>
-          <Option type="QString" value="false" name="labeling/fontSizeInMapUnits"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale"/>
-          <Option type="QString" value="false" name="labeling/fontStrikeout"/>
-          <Option type="QString" value="false" name="labeling/fontUnderline"/>
-          <Option type="QString" value="63" name="labeling/fontWeight"/>
-          <Option type="QString" value="0" name="labeling/fontWordSpacing"/>
-          <Option type="QString" value="false" name="labeling/formatNumbers"/>
-          <Option type="QString" value="false" name="labeling/isExpression"/>
-          <Option type="QString" value="true" name="labeling/labelOffsetInMapUnits"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale"/>
-          <Option type="QString" value="false" name="labeling/labelPerPart"/>
-          <Option type="QString" value="&lt;" name="labeling/leftDirectionSymbol"/>
-          <Option type="QString" value="false" name="labeling/limitNumLabels"/>
-          <Option type="QString" value="20" name="labeling/maxCurvedCharAngleIn"/>
-          <Option type="QString" value="-20" name="labeling/maxCurvedCharAngleOut"/>
-          <Option type="QString" value="2000" name="labeling/maxNumLabels"/>
-          <Option type="QString" value="false" name="labeling/mergeLines"/>
-          <Option type="QString" value="0" name="labeling/minFeatureSize"/>
-          <Option type="QString" value="0" name="labeling/multilineAlign"/>
-          <Option type="QString" value="1" name="labeling/multilineHeight"/>
-          <Option type="QString" value="Semibold" name="labeling/namedStyle"/>
-          <Option type="QString" value="true" name="labeling/obstacle"/>
-          <Option type="QString" value="1" name="labeling/obstacleFactor"/>
-          <Option type="QString" value="0" name="labeling/obstacleType"/>
-          <Option type="QString" value="0" name="labeling/offsetType"/>
-          <Option type="QString" value="0" name="labeling/placeDirectionSymbol"/>
-          <Option type="QString" value="0" name="labeling/placement"/>
-          <Option type="QString" value="10" name="labeling/placementFlags"/>
-          <Option type="QString" value="false" name="labeling/plussign"/>
-          <Option type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder"/>
-          <Option type="QString" value="true" name="labeling/preserveRotation"/>
-          <Option type="QString" value="#ffffff" name="labeling/previewBkgrdColor"/>
-          <Option type="QString" value="5" name="labeling/priority"/>
-          <Option type="QString" value="4" name="labeling/quadOffset"/>
-          <Option type="QString" value="0" name="labeling/repeatDistance"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/repeatDistanceUnit"/>
-          <Option type="QString" value="false" name="labeling/reverseDirectionSymbol"/>
-          <Option type="QString" value=">" name="labeling/rightDirectionSymbol"/>
-          <Option type="QString" value="10000000" name="labeling/scaleMax"/>
-          <Option type="QString" value="1" name="labeling/scaleMin"/>
-          <Option type="QString" value="false" name="labeling/scaleVisibility"/>
-          <Option type="QString" value="6" name="labeling/shadowBlendMode"/>
-          <Option type="QString" value="0" name="labeling/shadowColorB"/>
-          <Option type="QString" value="0" name="labeling/shadowColorG"/>
-          <Option type="QString" value="0" name="labeling/shadowColorR"/>
-          <Option type="QString" value="false" name="labeling/shadowDraw"/>
-          <Option type="QString" value="135" name="labeling/shadowOffsetAngle"/>
-          <Option type="QString" value="1" name="labeling/shadowOffsetDist"/>
-          <Option type="QString" value="true" name="labeling/shadowOffsetGlobal"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shadowOffsetUnits"/>
-          <Option type="QString" value="1.5" name="labeling/shadowRadius"/>
-          <Option type="QString" value="false" name="labeling/shadowRadiusAlphaOnly"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shadowRadiusUnits"/>
-          <Option type="QString" value="100" name="labeling/shadowScale"/>
-          <Option type="QString" value="30" name="labeling/shadowTransparency"/>
-          <Option type="QString" value="0" name="labeling/shadowUnder"/>
-          <Option type="QString" value="0" name="labeling/shapeBlendMode"/>
-          <Option type="QString" value="255" name="labeling/shapeBorderColorA"/>
-          <Option type="QString" value="128" name="labeling/shapeBorderColorB"/>
-          <Option type="QString" value="128" name="labeling/shapeBorderColorG"/>
-          <Option type="QString" value="128" name="labeling/shapeBorderColorR"/>
-          <Option type="QString" value="0" name="labeling/shapeBorderWidth"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shapeBorderWidthUnits"/>
-          <Option type="QString" value="true" name="labeling/shapeDraw"/>
-          <Option type="QString" value="255" name="labeling/shapeFillColorA"/>
-          <Option type="QString" value="138" name="labeling/shapeFillColorB"/>
-          <Option type="QString" value="0" name="labeling/shapeFillColorG"/>
-          <Option type="QString" value="101" name="labeling/shapeFillColorR"/>
-          <Option type="QString" value="64" name="labeling/shapeJoinStyle"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shapeOffsetUnits"/>
-          <Option type="QString" value="0" name="labeling/shapeOffsetX"/>
-          <Option type="QString" value="0" name="labeling/shapeOffsetY"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shapeRadiiUnits"/>
-          <Option type="QString" value="0" name="labeling/shapeRadiiX"/>
-          <Option type="QString" value="0" name="labeling/shapeRadiiY"/>
-          <Option type="QString" value="0" name="labeling/shapeRotation"/>
-          <Option type="QString" value="0" name="labeling/shapeRotationType"/>
-          <Option type="QString" value="" name="labeling/shapeSVGFile"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale"/>
-          <Option type="QString" value="0" name="labeling/shapeSizeType"/>
-          <Option type="QString" value="1" name="labeling/shapeSizeUnits"/>
-          <Option type="QString" value="0" name="labeling/shapeSizeX"/>
-          <Option type="QString" value="0" name="labeling/shapeSizeY"/>
-          <Option type="QString" value="0" name="labeling/shapeTransparency"/>
-          <Option type="QString" value="0" name="labeling/shapeType"/>
-          <Option type="QString" value="255" name="labeling/textColorA"/>
-          <Option type="QString" value="255" name="labeling/textColorB"/>
-          <Option type="QString" value="255" name="labeling/textColorG"/>
-          <Option type="QString" value="255" name="labeling/textColorR"/>
-          <Option type="QString" value="0" name="labeling/textTransp"/>
-          <Option type="QString" value="0" name="labeling/upsidedownLabels"/>
-          <Option type="QString" value="" name="labeling/wrapChar"/>
-          <Option type="QString" value="0" name="labeling/xOffset"/>
-          <Option type="QString" value="0" name="labeling/yOffset"/>
-          <Option type="QString" value="0" name="labeling/zIndex"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="labeling/addDirectionSymbol" value="false" type="QString"/>
+          <Option name="labeling/angleOffset" value="0" type="QString"/>
+          <Option name="labeling/blendMode" value="0" type="QString"/>
+          <Option name="labeling/bufferBlendMode" value="0" type="QString"/>
+          <Option name="labeling/bufferColorA" value="255" type="QString"/>
+          <Option name="labeling/bufferColorB" value="255" type="QString"/>
+          <Option name="labeling/bufferColorG" value="255" type="QString"/>
+          <Option name="labeling/bufferColorR" value="255" type="QString"/>
+          <Option name="labeling/bufferDraw" value="false" type="QString"/>
+          <Option name="labeling/bufferJoinStyle" value="64" type="QString"/>
+          <Option name="labeling/bufferNoFill" value="false" type="QString"/>
+          <Option name="labeling/bufferSize" value="1" type="QString"/>
+          <Option name="labeling/bufferSizeInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/bufferTransp" value="0" type="QString"/>
+          <Option name="labeling/centroidInside" value="false" type="QString"/>
+          <Option name="labeling/centroidWhole" value="false" type="QString"/>
+          <Option name="labeling/decimals" value="3" type="QString"/>
+          <Option name="labeling/displayAll" value="false" type="QString"/>
+          <Option name="labeling/dist" value="0" type="QString"/>
+          <Option name="labeling/distInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/distMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/drawLabels" value="false" type="QString"/>
+          <Option name="labeling/enabled" value="false" type="QString"/>
+          <Option name="labeling/fieldName" value="position" type="QString"/>
+          <Option name="labeling/fitInPolygonOnly" value="false" type="QString"/>
+          <Option name="labeling/fontCapitals" value="0" type="QString"/>
+          <Option name="labeling/fontFamily" value="Myriad Pro" type="QString"/>
+          <Option name="labeling/fontItalic" value="false" type="QString"/>
+          <Option name="labeling/fontLetterSpacing" value="0" type="QString"/>
+          <Option name="labeling/fontLimitPixelSize" value="false" type="QString"/>
+          <Option name="labeling/fontMaxPixelSize" value="10000" type="QString"/>
+          <Option name="labeling/fontMinPixelSize" value="3" type="QString"/>
+          <Option name="labeling/fontSize" value="10" type="QString"/>
+          <Option name="labeling/fontSizeInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/fontStrikeout" value="false" type="QString"/>
+          <Option name="labeling/fontUnderline" value="false" type="QString"/>
+          <Option name="labeling/fontWeight" value="63" type="QString"/>
+          <Option name="labeling/fontWordSpacing" value="0" type="QString"/>
+          <Option name="labeling/formatNumbers" value="false" type="QString"/>
+          <Option name="labeling/isExpression" value="false" type="QString"/>
+          <Option name="labeling/labelOffsetInMapUnits" value="true" type="QString"/>
+          <Option name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/labelPerPart" value="false" type="QString"/>
+          <Option name="labeling/leftDirectionSymbol" value="&lt;" type="QString"/>
+          <Option name="labeling/limitNumLabels" value="false" type="QString"/>
+          <Option name="labeling/maxCurvedCharAngleIn" value="20" type="QString"/>
+          <Option name="labeling/maxCurvedCharAngleOut" value="-20" type="QString"/>
+          <Option name="labeling/maxNumLabels" value="2000" type="QString"/>
+          <Option name="labeling/mergeLines" value="false" type="QString"/>
+          <Option name="labeling/minFeatureSize" value="0" type="QString"/>
+          <Option name="labeling/multilineAlign" value="0" type="QString"/>
+          <Option name="labeling/multilineHeight" value="1" type="QString"/>
+          <Option name="labeling/namedStyle" value="Semibold" type="QString"/>
+          <Option name="labeling/obstacle" value="true" type="QString"/>
+          <Option name="labeling/obstacleFactor" value="1" type="QString"/>
+          <Option name="labeling/obstacleType" value="0" type="QString"/>
+          <Option name="labeling/offsetType" value="0" type="QString"/>
+          <Option name="labeling/placeDirectionSymbol" value="0" type="QString"/>
+          <Option name="labeling/placement" value="0" type="QString"/>
+          <Option name="labeling/placementFlags" value="10" type="QString"/>
+          <Option name="labeling/plussign" value="false" type="QString"/>
+          <Option name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString"/>
+          <Option name="labeling/preserveRotation" value="true" type="QString"/>
+          <Option name="labeling/previewBkgrdColor" value="#ffffff" type="QString"/>
+          <Option name="labeling/priority" value="5" type="QString"/>
+          <Option name="labeling/quadOffset" value="4" type="QString"/>
+          <Option name="labeling/repeatDistance" value="0" type="QString"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/repeatDistanceUnit" value="1" type="QString"/>
+          <Option name="labeling/reverseDirectionSymbol" value="false" type="QString"/>
+          <Option name="labeling/rightDirectionSymbol" value=">" type="QString"/>
+          <Option name="labeling/scaleMax" value="10000000" type="QString"/>
+          <Option name="labeling/scaleMin" value="1" type="QString"/>
+          <Option name="labeling/scaleVisibility" value="false" type="QString"/>
+          <Option name="labeling/shadowBlendMode" value="6" type="QString"/>
+          <Option name="labeling/shadowColorB" value="0" type="QString"/>
+          <Option name="labeling/shadowColorG" value="0" type="QString"/>
+          <Option name="labeling/shadowColorR" value="0" type="QString"/>
+          <Option name="labeling/shadowDraw" value="false" type="QString"/>
+          <Option name="labeling/shadowOffsetAngle" value="135" type="QString"/>
+          <Option name="labeling/shadowOffsetDist" value="1" type="QString"/>
+          <Option name="labeling/shadowOffsetGlobal" value="true" type="QString"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shadowOffsetUnits" value="1" type="QString"/>
+          <Option name="labeling/shadowRadius" value="1.5" type="QString"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" value="false" type="QString"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shadowRadiusUnits" value="1" type="QString"/>
+          <Option name="labeling/shadowScale" value="100" type="QString"/>
+          <Option name="labeling/shadowTransparency" value="30" type="QString"/>
+          <Option name="labeling/shadowUnder" value="0" type="QString"/>
+          <Option name="labeling/shapeBlendMode" value="0" type="QString"/>
+          <Option name="labeling/shapeBorderColorA" value="255" type="QString"/>
+          <Option name="labeling/shapeBorderColorB" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderColorG" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderColorR" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderWidth" value="0" type="QString"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeBorderWidthUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeDraw" value="true" type="QString"/>
+          <Option name="labeling/shapeFillColorA" value="255" type="QString"/>
+          <Option name="labeling/shapeFillColorB" value="138" type="QString"/>
+          <Option name="labeling/shapeFillColorG" value="0" type="QString"/>
+          <Option name="labeling/shapeFillColorR" value="101" type="QString"/>
+          <Option name="labeling/shapeJoinStyle" value="64" type="QString"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeOffsetUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeOffsetX" value="0" type="QString"/>
+          <Option name="labeling/shapeOffsetY" value="0" type="QString"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeRadiiUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeRadiiX" value="0" type="QString"/>
+          <Option name="labeling/shapeRadiiY" value="0" type="QString"/>
+          <Option name="labeling/shapeRotation" value="0" type="QString"/>
+          <Option name="labeling/shapeRotationType" value="0" type="QString"/>
+          <Option name="labeling/shapeSVGFile" value="" type="QString"/>
+          <Option name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeSizeType" value="0" type="QString"/>
+          <Option name="labeling/shapeSizeUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeSizeX" value="0" type="QString"/>
+          <Option name="labeling/shapeSizeY" value="0" type="QString"/>
+          <Option name="labeling/shapeTransparency" value="0" type="QString"/>
+          <Option name="labeling/shapeType" value="0" type="QString"/>
+          <Option name="labeling/textColorA" value="255" type="QString"/>
+          <Option name="labeling/textColorB" value="255" type="QString"/>
+          <Option name="labeling/textColorG" value="255" type="QString"/>
+          <Option name="labeling/textColorR" value="255" type="QString"/>
+          <Option name="labeling/textTransp" value="0" type="QString"/>
+          <Option name="labeling/upsidedownLabels" value="0" type="QString"/>
+          <Option name="labeling/wrapChar" value="" type="QString"/>
+          <Option name="labeling/xOffset" value="0" type="QString"/>
+          <Option name="labeling/yOffset" value="0" type="QString"/>
+          <Option name="labeling/zIndex" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="100000" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{4b343717-1e6e-45db-9c96-a3c1a5219761}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -8864,16 +7278,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="10" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="10" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8884,8 +7298,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -8894,8 +7308,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -8904,8 +7318,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -8916,31 +7330,36 @@ def my_form_open(dialog, layer, feature):
         <alias field="position" index="1" name=""/>
         <alias field="type" index="2" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="position"/>
+        <policy policy="Duplicate" field="type"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="position" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="type"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="position" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="position"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="position" width="-1" type="field" hidden="0"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9016,7 +7435,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="Polygon" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" styleCategories="AllStyleCategories">
+    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Polygon" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -9065,6 +7484,7 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -9081,7 +7501,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -9110,241 +7530,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="164,113,88,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="164,113,88,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="164,113,88,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="164,113,88,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="117,81,63,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="164,113,88,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="117,81,63,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="164,113,88,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="117,81,63,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="164,113,88,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="117,81,63,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="164,113,88,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="117,81,63,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="164,113,88,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="117,81,63,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="0,85,0,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,85,0,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="b_diagonal" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,85,0,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,85,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="b_diagonal" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,85,0,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,85,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9355,95 +7707,68 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="no_action" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="&quot;name&quot;"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="&quot;name&quot;" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{d22f44d7-7a5a-427f-afda-732ba2664339}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -9451,22 +7776,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="1" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="1" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </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" value="0" name="allowedGapsBuffer"/>
-            <Option type="bool" value="false" name="allowedGapsEnabled"/>
-            <Option type="QString" value="" name="allowedGapsLayer"/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -9524,43 +7849,51 @@ def my_form_open(dialog, layer, feature):
         <alias field="cone_len" index="4" name=""/>
         <alias field="fence_len" index="5" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="name"/>
+        <policy policy="Duplicate" field="group"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="cone_len"/>
+        <policy policy="Duplicate" field="fence_len"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="cone_len"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="group" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="cone_len" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="fence_len" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="group"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="day"/>
-        <constraint desc="" exp="" field="cone_len"/>
-        <constraint desc="" exp="" field="fence_len"/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="group" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
+        <constraint field="cone_len" exp="" desc=""/>
+        <constraint field="fence_len" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="415" name="name"/>
-          <column hidden="0" type="field" width="-1" name="group"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="cone_len"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
-          <column hidden="0" type="field" width="-1" name="fence_len"/>
+          <column name="name" width="415" type="field" hidden="0"/>
+          <column name="group" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="cone_len" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="fence_len" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9592,35 +7925,35 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="cone_len"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="fence_len"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="cone_len" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="fence_len" editable="1"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="fence_len"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="fence_len" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="fence_len"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="fence_len" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -9669,23 +8002,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -9699,26 +8033,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" precision="0" name="fence_len"/>
-        <field comment="" typeName="double precision" subType="0" type="6" 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"/>
-        <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" precision="0" name="cone_len"/>
+        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis maxScale="0" simplifyMaxScale="1" simplifyDrawingHints="1" labelsEnabled="1" readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" version="3.8.3-Zanzibar" simplifyDrawingTol="1" minScale="1e+08" simplifyAlgorithm="0">
+          <qgis labelsEnabled="1" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyDrawingHints="1" simplifyLocal="1" simplifyAlgorithm="0" simplifyMaxScale="1" version="3.8.3-Zanzibar" minScale="1e+08">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 symbollevels="1" enableorderby="0" type="RuleRenderer" forceraster="0">
+            <renderer-v2 enableorderby="0" symbollevels="1" type="RuleRenderer" forceraster="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible"/>
+                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="0" label="Visible"/>
               </rules>
               <symbols>
-                <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" alpha="1">
-                  <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <symbol name="0" clip_to_extent="1" alpha="1" type="line" force_rhr="0">
+                  <layer locked="0" enabled="1" pass="0" class="SimpleLine">
                     <prop v="square" k="capstyle"/>
                     <prop v="5;2" k="customdash"/>
                     <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -9737,9 +8071,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" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -9750,62 +8084,62 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style namedStyle="Regular" fontItalic="0" fontUnderline="0" fontLetterSpacing="0" isExpression="0" fontCapitals="0" previewBkgrdColor="#ffffff" textColor="0,0,0,255" fontStrikeout="0" multilineHeight="1" blendMode="0" fieldName="comment" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.8" fontWordSpacing="0" fontSize="11" fontWeight="50" fontSizeUnit="Point" useSubstitutions="0" fontFamily="Myriad Pro">
-                      <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <background shapeRadiiUnit="MM" shapeSizeY="1" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.6" shapeOffsetUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.6" shapeOffsetY="0" shapeSizeX="1"/>
-                      <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowScale="100" shadowOpacity="0.7" shadowBlendMode="6"/>
+                    <text-style fontSizeUnit="Point" textOpacity="0.8" fontLetterSpacing="0" fontFamily="Myriad Pro" fontItalic="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontCapitals="0" fieldName="comment" fontSize="11" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+                      <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0"/>
+                      <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeSizeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeOffsetY="0" shapeType="0" shapeBorderWidth="0.6" shapeRadiiX="1" shapeBorderColor="255,255,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="0.6" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeOffsetUnit="MM"/>
+                      <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowScale="100" shadowDraw="0" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="4294967295" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-                    <placement maxCurvedCharAngleIn="25" offsetUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" offsetType="0" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" dist="5" priority="5" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="4" placementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" geometryGenerator="" repeatDistanceUnits="MM" centroidWhole="0" xOffset="0" repeatDistance="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" centroidInside="0" yOffset="0" rotationAngle="0" geometryGeneratorType="PointGeometry"/>
-                    <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" displayAll="1" fontLimitPixelSize="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="1"/>
+                    <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" wrapChar="" rightDirectionSymbol=">" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+                    <placement distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" maxCurvedCharAngleOut="-25" rotationAngle="0" geometryGeneratorType="PointGeometry" geometryGenerator="" centroidWhole="0" maxCurvedCharAngleIn="25" placementFlags="2" fitInPolygonOnly="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" priority="5" quadOffset="4" dist="5" repeatDistanceUnits="MM" yOffset="0" xOffset="0" centroidInside="0" placement="4" geometryGeneratorEnabled="0" offsetType="0"/>
+                    <rendering displayAll="1" fontMinPixelSize="3" scaleMax="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="1" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
-                        <Option type="Map" name="properties">
-                          <Option type="Map" name="PositionX">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties" type="Map">
+                          <Option name="PositionX" type="Map">
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
-                          <Option type="Map" name="PositionY">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                          <Option name="PositionY" type="Map">
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                         </Option>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
                 <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" fontLetterSpacing="0" isExpression="1" fontCapitals="0" previewBkgrdColor="#ffffff" textColor="0,0,0,255" fontStrikeout="0" multilineHeight="1" blendMode="0" fieldName="round( $length, 1) || 'm'" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" fontSize="12" fontWeight="63" fontSizeUnit="Point" useSubstitutions="0" fontFamily="Myriad Pro">
-                      <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0"/>
-                      <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowScale="100" shadowOpacity="0.7" shadowBlendMode="6"/>
+                    <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontItalic="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontCapitals="0" fieldName="round( $length, 1) || 'm'" fontSize="12" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+                      <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0"/>
+                      <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeOffsetY="0" shapeType="0" shapeBorderWidth="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeOffsetUnit="MM"/>
+                      <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowScale="100" shadowDraw="0" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="4294967295" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-                    <placement maxCurvedCharAngleIn="25" offsetUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" offsetType="0" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" dist="1" priority="5" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" placementFlags="15" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" geometryGenerator="" repeatDistanceUnits="MM" centroidWhole="0" xOffset="0" repeatDistance="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" centroidInside="0" yOffset="0" rotationAngle="0" geometryGeneratorType="PointGeometry"/>
-                    <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" displayAll="0" fontLimitPixelSize="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+                    <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" wrapChar="" rightDirectionSymbol=">" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+                    <placement distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" maxCurvedCharAngleOut="-25" rotationAngle="0" geometryGeneratorType="PointGeometry" geometryGenerator="" centroidWhole="0" maxCurvedCharAngleIn="25" placementFlags="15" fitInPolygonOnly="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" priority="5" quadOffset="4" dist="1" repeatDistanceUnits="MM" yOffset="0" xOffset="0" centroidInside="0" placement="2" geometryGeneratorEnabled="0" offsetType="0"/>
+                    <rendering displayAll="0" fontMinPixelSize="3" scaleMax="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
-                        <Option type="Map" name="properties">
-                          <Option type="Map" name="PositionX">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties" type="Map">
+                          <Option name="PositionX" type="Map">
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
-                          <Option type="Map" name="PositionY">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                          <Option name="PositionY" type="Map">
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                         </Option>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -9822,21 +8156,21 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-              <DiagramCategory sizeType="MM" rotationOffset="270" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" height="15" width="15" opacity="1" labelPlacementMethod="XHeight" enabled="0" barWidth="5" penWidth="0" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
+              <DiagramCategory scaleDependency="Area" minScaleDenominator="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" enabled="0" opacity="1" penWidth="0" diagramOrientation="Up" penColor="#000000" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" width="15" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
                 <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute color="#000000" label="" field=""/>
+                <attribute field="" color="#000000" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings priority="0" showAll="1" dist="0" obstacle="0" placement="2" linePlacementFlags="18" zIndex="0">
+            <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" dist="0" linePlacementFlags="18">
               <properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -9920,81 +8254,81 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias index="0" field="id" name=""/>
-              <alias index="1" field="group" name=""/>
-              <alias index="2" field="comment" name=""/>
-              <alias index="3" field="moveable" name=""/>
-              <alias index="4" field="type" name=""/>
-              <alias index="5" field="name" name=""/>
-              <alias index="6" field="hidden" name=""/>
-              <alias index="7" field="auxiliary_storage_labeling_positiony" name=""/>
-              <alias index="8" field="auxiliary_storage_labeling_positionx" name=""/>
-              <alias index="9" field="fence_len" name=""/>
-              <alias index="10" field="cone_len" name=""/>
+              <alias field="id" name="" index="0"/>
+              <alias field="group" name="" index="1"/>
+              <alias field="comment" name="" index="2"/>
+              <alias field="moveable" name="" index="3"/>
+              <alias field="type" name="" index="4"/>
+              <alias field="name" name="" index="5"/>
+              <alias field="hidden" name="" index="6"/>
+              <alias field="auxiliary_storage_labeling_positiony" name="" index="7"/>
+              <alias field="auxiliary_storage_labeling_positionx" name="" index="8"/>
+              <alias field="fence_len" name="" index="9"/>
+              <alias field="cone_len" name="" index="10"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <default applyOnUpdate="0" expression="" field="id"/>
-              <default applyOnUpdate="0" expression="" field="group"/>
-              <default applyOnUpdate="0" expression="" field="comment"/>
-              <default applyOnUpdate="0" expression="" field="moveable"/>
-              <default applyOnUpdate="0" expression="" field="type"/>
-              <default applyOnUpdate="0" expression="" field="name"/>
-              <default applyOnUpdate="0" expression="" field="hidden"/>
-              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positiony"/>
-              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positionx"/>
-              <default applyOnUpdate="0" expression="" field="fence_len"/>
-              <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="group" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="comment" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="moveable" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="name" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="hidden" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="auxiliary_storage_labeling_positiony" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="auxiliary_storage_labeling_positionx" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="fence_len" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="cone_len" exp_strength="0"/>
+              <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="comment" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="moveable" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="hidden" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
             </constraints>
             <constraintExpressions>
-              <constraint desc="" exp="" field="id"/>
-              <constraint desc="" exp="" field="group"/>
-              <constraint desc="" exp="" field="comment"/>
-              <constraint desc="" exp="" field="moveable"/>
-              <constraint desc="" exp="" field="type"/>
-              <constraint desc="" exp="" field="name"/>
-              <constraint desc="" exp="" field="hidden"/>
-              <constraint desc="" exp="" field="auxiliary_storage_labeling_positiony"/>
-              <constraint desc="" exp="" field="auxiliary_storage_labeling_positionx"/>
-              <constraint desc="" exp="" field="fence_len"/>
-              <constraint desc="" exp="" field="cone_len"/>
+              <constraint field="id" exp="" desc=""/>
+              <constraint field="group" exp="" desc=""/>
+              <constraint field="comment" exp="" desc=""/>
+              <constraint field="moveable" exp="" desc=""/>
+              <constraint field="type" exp="" desc=""/>
+              <constraint field="name" exp="" desc=""/>
+              <constraint field="hidden" exp="" desc=""/>
+              <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
+              <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
+              <constraint field="fence_len" exp="" desc=""/>
+              <constraint field="cone_len" exp="" desc=""/>
             </constraintExpressions>
             <expressionfields>
-              <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" name="fence_len"/>
-              <field comment="" typeName="double precision" subType="0" type="6" 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"/>
-              <field comment="" typeName="double precision" subType="0" type="6" 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"/>
+              <field name="fence_len" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment="" typeName="double precision" subType="0" type="6" precision="0"/>
+              <field name="fence_len" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" typeName="double precision" subType="0" type="6" precision="0"/>
+              <field name="cone_len" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment="" typeName="double precision" subType="0" type="6" precision="0"/>
             </expressionfields>
             <attributeactions>
               <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
+            <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
               <columns>
-                <column hidden="0" width="-1" type="field" name="id"/>
-                <column hidden="0" width="-1" type="field" name="group"/>
-                <column hidden="1" width="-1" type="actions"/>
-                <column hidden="0" width="223" type="field" name="comment"/>
-                <column hidden="0" width="-1" type="field" name="moveable"/>
-                <column hidden="0" width="-1" type="field" name="type"/>
-                <column hidden="0" width="414" type="field" name="name"/>
-                <column hidden="0" width="-1" type="field" name="hidden"/>
-                <column hidden="0" width="-1" type="field" name="fence_len"/>
-                <column hidden="0" width="-1" type="field" name="cone_len"/>
-                <column hidden="1" width="-1" type="field" name="auxiliary_storage_labeling_positiony"/>
-                <column hidden="1" width="-1" type="field" name="auxiliary_storage_labeling_positionx"/>
+                <column name="id" width="-1" type="field" hidden="0"/>
+                <column name="group" width="-1" type="field" hidden="0"/>
+                <column width="-1" type="actions" hidden="1"/>
+                <column name="comment" width="223" type="field" hidden="0"/>
+                <column name="moveable" width="-1" type="field" hidden="0"/>
+                <column name="type" width="-1" type="field" hidden="0"/>
+                <column name="name" width="414" type="field" hidden="0"/>
+                <column name="hidden" width="-1" type="field" hidden="0"/>
+                <column name="fence_len" width="-1" type="field" hidden="0"/>
+                <column name="cone_len" width="-1" type="field" hidden="0"/>
+                <column name="auxiliary_storage_labeling_positiony" width="-1" type="field" hidden="1"/>
+                <column name="auxiliary_storage_labeling_positionx" width="-1" type="field" hidden="1"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -10025,18 +8359,18 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-              <field editable="1" name="comment"/>
-              <field editable="0" name="cone_len"/>
-              <field editable="0" name="fence_len"/>
-              <field editable="1" name="group"/>
-              <field editable="1" name="hidden"/>
-              <field editable="1" name="id"/>
-              <field editable="0" name="length"/>
-              <field editable="1" name="moveable"/>
-              <field editable="1" name="name"/>
-              <field editable="1" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+              <field name="comment" editable="1"/>
+              <field name="cone_len" editable="0"/>
+              <field name="fence_len" editable="0"/>
+              <field name="group" editable="1"/>
+              <field name="hidden" editable="1"/>
+              <field name="id" editable="1"/>
+              <field name="length" editable="0"/>
+              <field name="moveable" editable="1"/>
+              <field name="name" editable="1"/>
+              <field name="type" editable="1"/>
             </editable>
             <labelOnTop>
               <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
@@ -10067,677 +8401,458 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{b24077c4-36ed-44b5-830f-d1243f319030}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="133,182,111,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="133,182,111,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="133,182,111,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="133,182,111,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="95,130,79,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="133,182,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="95,130,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="133,182,111,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="95,130,79,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{b240180c-f59a-4dbd-a750-c3204efd6d54}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="133,182,111,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="95,130,79,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="133,182,111,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="95,130,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="133,182,111,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="95,130,79,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="1" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="1" type="RuleRenderer" forceraster="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
           <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" label="Show in fencing maps">
-            <rule symbol="0" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" label="Cones"/>
-            <rule symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" label="Moveable fences"/>
-            <rule symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" label="Fixed fences"/>
-            <rule symbol="3" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" label="Construction"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" symbol="0" label="Cones"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" symbol="1" label="Moveable fences"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" symbol="2" label="Fixed fences"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" symbol="3" label="Construction"/>
           </rule>
-          <rule symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" label="Is Visible"/>
-          <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" symbol="4" label="Is Visible"/>
+          <rule key="{29865286-9e35-459b-929c-beb87e7538de}" symbol="5" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="round" name="capstyle"/>
-                <Option type="QString" value="1;4" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="Point" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="255,255,0,255" name="line_color"/>
-                <Option type="QString" value="dot" name="line_style"/>
-                <Option type="QString" value="1" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="1" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="round" type="QString"/>
+                <Option name="customdash" value="1;4" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="Point" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="255,255,0,255" type="QString"/>
+                <Option name="line_style" value="dot" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="round" k="capstyle"/>
-              <prop v="1;4" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="Point" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="dot" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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')" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="1" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{67070045-bee5-4271-87d3-86da17eb7dbe}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="round" name="capstyle"/>
-                <Option type="QString" value="4;3" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="255,255,0,255" name="line_color"/>
-                <Option type="QString" value="dash" name="line_style"/>
-                <Option type="QString" value="1" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="round" type="QString"/>
+                <Option name="customdash" value="4;3" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="255,255,0,255" type="QString"/>
+                <Option name="line_style" value="dash" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="round" k="capstyle"/>
-              <prop v="4;3" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="dash" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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')" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="2" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="255,255,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.8" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="255,255,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.8" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.8" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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')" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="3" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="3" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{63390b08-62bc-49cf-9253-f38f2f5873ba}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0,255,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.8" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,255,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.8" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,255,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.8" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="4" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="4" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="255,255,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.26" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="255,255,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="5" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="5" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="213,180,60,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.26" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="213,180,60,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="213,180,60,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10748,628 +8863,527 @@ def my_form_open(dialog, layer, feature):
         <rules key="{23c89a1d-a8e0-4ceb-943a-dc351cead91c}">
           <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}">
             <settings calloutType="simple">
-              <text-style namedStyle="Regular" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="comment" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.80000000000000004" fontWordSpacing="0" textOrientation="horizontal" fontSize="11" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="0.80000000000000004" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="comment" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="1" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.59999999999999998" shapeOffsetUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.59999999999999998" shapeOffsetY="0" shapeSizeX="1">
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="255,255,0,255" shapeBorderWidth="0.59999999999999998" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="0.59999999999999998" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="round" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="255,255,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.6" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="255,255,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.6" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="round" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="255,255,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.6" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="4294967295" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MM" priority="5" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="14" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="2" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="5"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1.8200000000000001" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="1"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="4294967295" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="5" xOffset="0" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="14" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="1" obstacleFactor="1.8200000000000001" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Fence lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="11" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="196,60,57,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="196,60,57,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="196,60,57,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                        <Option type="QString" value="no" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="128,128,128,255" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MM" priority="6" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="LineGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="14" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="2" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="6" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="14" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="1" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="1" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Cones lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="11" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="196,60,57,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="196,60,57,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="196,60,57,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                        <Option type="QString" value="no" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="128,128,128,255" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MM" priority="6" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="LineGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="14" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="2" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="6" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="14" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="1" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="1" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0" key="{359df8b8-e018-47fc-a639-e6e8d7640da2}">
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{359df8b8-e018-47fc-a639-e6e8d7640da2}" active="0">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="11" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="196,60,57,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="196,60,57,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="196,60,57,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                        <Option type="QString" value="no" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="128,128,128,255" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MM" priority="6" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="LineGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="14" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="2" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="6" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="14" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="1" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="1" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -11378,95 +9392,68 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="&quot;id&quot;"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="&quot;id&quot;" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11474,16 +9461,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11573,63 +9560,75 @@ def my_form_open(dialog, layer, feature):
         <alias field="fence_len" index="8" name=""/>
         <alias field="cone_len" index="9" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="group"/>
+        <policy policy="Duplicate" field="comment"/>
+        <policy policy="Duplicate" field="moveable"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="name"/>
+        <policy policy="Duplicate" field="hidden"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="fence_len"/>
+        <policy policy="Duplicate" field="cone_len"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="comment"/>
-        <default applyOnUpdate="0" expression="" field="moveable"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="hidden"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="fence_len"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="group" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="comment" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="moveable" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="hidden" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="fence_len" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="cone_len" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="comment" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="moveable" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="hidden" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="group"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="moveable"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="hidden"/>
-        <constraint desc="" exp="" field="day"/>
-        <constraint desc="" exp="" field="fence_len"/>
-        <constraint desc="" exp="" field="cone_len"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="group" exp="" desc=""/>
+        <constraint field="comment" exp="" desc=""/>
+        <constraint field="moveable" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="hidden" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
+        <constraint field="fence_len" exp="" desc=""/>
+        <constraint field="cone_len" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" precision="0" name="fence_len"/>
-        <field comment="" typeName="double precision" subType="0" type="6" 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"/>
-        <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" precision="0" name="cone_len"/>
+        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;name&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="group"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="373" name="comment"/>
-          <column hidden="0" type="field" width="-1" name="moveable"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="316" name="name"/>
-          <column hidden="0" type="field" width="-1" name="hidden"/>
-          <column hidden="0" type="field" width="-1" name="fence_len"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
-          <column hidden="0" type="field" width="-1" name="cone_len"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="group" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="comment" width="373" type="field" hidden="0"/>
+          <column name="moveable" width="-1" type="field" hidden="0"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="name" width="316" type="field" hidden="0"/>
+          <column name="hidden" width="-1" type="field" hidden="0"/>
+          <column name="fence_len" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="cone_len" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11661,53 +9660,53 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="comment"/>
-        <field editable="0" name="cone_len"/>
-        <field editable="1" name="day"/>
-        <field editable="0" name="fence_len"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="hidden"/>
-        <field editable="1" name="id"/>
-        <field editable="0" name="length"/>
-        <field editable="1" name="moveable"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="comment" editable="1"/>
+        <field name="cone_len" editable="0"/>
+        <field name="day" editable="1"/>
+        <field name="fence_len" editable="0"/>
+        <field name="group" editable="1"/>
+        <field name="hidden" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length" editable="0"/>
+        <field name="moveable" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="comment"/>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="fence_len"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="hidden"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length"/>
-        <field labelOnTop="0" name="moveable"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="comment" labelOnTop="0"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="fence_len" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="hidden" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length" labelOnTop="0"/>
+        <field name="moveable" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="comment"/>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="fence_len"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="hidden"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="moveable"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="comment" reuseLastValue="0"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="fence_len" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="hidden" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="moveable" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -11747,19 +9746,20 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -11780,273 +9780,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="164,113,88,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="164,113,88,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="164,113,88,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="164,113,88,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="117,81,63,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="164,113,88,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="117,81,63,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="164,113,88,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="117,81,63,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="164,113,88,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="117,81,63,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="164,113,88,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="117,81,63,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="164,113,88,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="117,81,63,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{c73fab62-3b89-497c-a33c-6825e949a9db}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,178,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="1" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,178,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,178,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12057,93 +9973,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="&quot;id&quot;" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="&quot;id&quot;" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" italic="1" style="0" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12151,16 +10040,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12178,23 +10067,26 @@ def my_form_open(dialog, layer, feature):
       <aliases>
         <alias field="id" index="0" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
+        <constraint field="id" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12226,10 +10118,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -12237,7 +10129,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="MultiPolygon" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" refreshOnNotifyMessage="" geometry="Polygon" styleCategories="AllStyleCategories">
+    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -12277,19 +10169,20 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -12310,241 +10203,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="213,180,60,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="213,180,60,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="213,180,60,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="213,180,60,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="152,129,43,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="213,180,60,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="152,129,43,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="213,180,60,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="152,129,43,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{cf57a051-b643-427d-bb3e-3d8860aa79df}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="213,180,60,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="152,129,43,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="213,180,60,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="152,129,43,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="213,180,60,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="152,129,43,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="26,0,201,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                <Option type="QString" value="dot" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="b_diagonal" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="26,0,201,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="dot" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="b_diagonal" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="26,0,201,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="dot" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12555,104 +10380,77 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <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 type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="100000" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12660,22 +10458,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="2" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
-            <Option type="Map" name="properties">
-              <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+            <Option name="name" value="" type="QString"/>
+            <Option name="properties" type="Map">
+              <Option name="show" type="Map">
+                <Option name="active" value="true" type="bool"/>
+                <Option name="field" value="id" type="QString"/>
+                <Option name="type" value="2" type="int"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12686,8 +10484,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -12696,8 +10494,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -12706,8 +10504,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -12726,35 +10524,41 @@ def my_form_open(dialog, layer, feature):
         <alias field="page" index="2" name=""/>
         <alias field="day" index="3" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="page"/>
+        <policy policy="Duplicate" field="day"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="page"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="page" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="page" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="page"/>
-        <constraint desc="" exp="" field="day"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="page" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;page&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;page&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
-          <column hidden="0" type="field" width="-1" name="page"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="page" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12786,14 +10590,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="page"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="page" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="page"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="page" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -12801,7 +10605,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="Point" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" refreshOnNotifyMessage="" geometry="Point" styleCategories="AllStyleCategories">
+    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -12850,23 +10654,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -12877,7 +10682,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join editable="1" customPrefix="csv_" upsertOnEdit="1" memoryCache="0" joinFieldName="position" targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" cascadedDelete="0" hasCustomPrefix="1">
+        <join memoryCache="0" cascadedDelete="0" targetFieldName="position" joinFieldName="position" hasCustomPrefix="1" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" editable="1" upsertOnEdit="1" customPrefix="csv_">
           <joinFieldsSubset>
             <field name="day"/>
             <field name="position"/>
@@ -12904,378 +10709,264 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="id" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="id" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{44c3350e-7341-440a-99a7-76d72f8be3f3}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="114,155,111,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="114,155,111,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="114,155,111,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="114,155,111,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="81,111,79,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="114,155,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="81,111,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="114,155,111,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="81,111,79,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="114,155,111,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="81,111,79,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="114,155,111,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="81,111,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="114,155,111,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="81,111,79,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" description="Show in marshal overview" checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" label="Show by day in marshal plan"/>
-          <rule symbol="1" checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" label="Always show in marshal plan"/>
-          <rule symbol="2" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" label="Show in marshal maps"/>
+          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" symbol="0" label="Show by day in marshal plan"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" symbol="1" label="Always show in marshal plan" checkstate="0"/>
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" symbol="2" label="Show in marshal maps" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="0.8">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="marker" alpha="0.8" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}" locked="0" enabled="1" pass="1" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="circle" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="5" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="Pixel" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="Pixel" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="Pixel" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="1" frame_rate="10" clip_to_extent="1" alpha="0.8">
+          <symbol frame_rate="10" name="1" clip_to_extent="1" type="marker" alpha="0.8" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{984895dc-f666-478a-9853-cf8b1ad766f1}" locked="0" enabled="1" pass="1" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="circle" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="5" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="Pixel" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="Pixel" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="Pixel" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="2" frame_rate="10" clip_to_extent="1" alpha="0.01">
+          <symbol frame_rate="10" name="2" clip_to_extent="1" type="marker" alpha="0.01" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}" locked="0" enabled="1" pass="1" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="circle" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="0.1" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="0.1" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13286,953 +10977,822 @@ def my_form_open(dialog, layer, feature):
         <rules key="{2cd5bd60-2418-42c7-89dd-9f389593e547}">
           <rule description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{56651b46-8545-482e-850b-aa88b9a8dff4}">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" fontWordSpacing="0" textOrientation="horizontal" fontSize="6" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="6" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.5" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeOffsetY="0" shapeSizeX="0">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="231,113,72,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="231,113,72,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="231,113,72,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.1" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.1" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="0" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="2" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="2" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" active="0" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}">
+          <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}" active="0">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" fontWordSpacing="0" textOrientation="horizontal" fontSize="6" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="6" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.5" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeOffsetY="0" shapeSizeX="0">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="231,113,72,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="231,113,72,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="231,113,72,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.1" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.1" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="0" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="2" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="2" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" filter="'marshal' = attribute( @atlas_feature , 'type' )" active="0" key="{fd239986-b557-4314-b05a-d8c40105e0bc}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{fd239986-b557-4314-b05a-d8c40105e0bc}" active="0">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.5" fontWordSpacing="0" textOrientation="horizontal" fontSize="6" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="0.5" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="6" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.5" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeOffsetY="0" shapeSizeX="0.20000000000000001">
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.20000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.4" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.4" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.4" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="AlwaysShow">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( @atlasfeature_id = $id, 1, 0)" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="AlwaysShow" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlasfeature_id = $id, 1, 0)" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="FontOpacity">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="FontOpacity" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="FontStyle">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="ObstacleFactor">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                      <Option name="ObstacleFactor" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="Priority">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="Priority" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="ShapeOpacity">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="ShapeOpacity" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( @atlas_featureid = $id, 8, 6 )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlas_featureid = $id, 8, 6 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="ZIndex">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="ZIndex" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="1" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="8" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="0" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="5" upsidedownLabels="0" obstacleFactor="1.8" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="1" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="8" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="5" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1.8" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlasfeature_id = $id, 1, 0)" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlasfeature_id = $id, 1, 0)" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlas_featureid = $id, 8, 6 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlas_featureid = $id, 8, 6 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}">
             <settings calloutType="simple">
-              <text-style namedStyle="Regular" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.59999999999999998" fontWordSpacing="0" textOrientation="horizontal" fontSize="6" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="0.59999999999999998" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="6" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.59999999999999998" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeOffsetY="0" shapeSizeX="0.20000000000000001">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.20000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.59999999999999998" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="213,180,60,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="213,180,60,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="213,180,60,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.4" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.4" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.4" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="1" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="8" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="0" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="5" upsidedownLabels="0" obstacleFactor="1.8" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="1" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="8" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="5" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1.8" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{84d13a6c-d354-4356-be1f-5803dabd2773}">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" fontWordSpacing="0" textOrientation="horizontal" fontSize="8" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="8" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.90000000000000002" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeOffsetY="0" shapeSizeX="0.20000000000000001">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.20000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.90000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="133,182,111,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="133,182,111,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="133,182,111,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,0,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.4" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,0,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.4" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,0,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.4" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="1" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="0" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="0" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="10" upsidedownLabels="0" obstacleFactor="1.8" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="1" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="10" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1.8" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -14241,236 +11801,209 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <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 name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="QString" value="false" name="labeling/addDirectionSymbol"/>
-          <Option type="QString" value="0" name="labeling/angleOffset"/>
-          <Option type="QString" value="0" name="labeling/blendMode"/>
-          <Option type="QString" value="0" name="labeling/bufferBlendMode"/>
-          <Option type="QString" value="255" name="labeling/bufferColorA"/>
-          <Option type="QString" value="255" name="labeling/bufferColorB"/>
-          <Option type="QString" value="255" name="labeling/bufferColorG"/>
-          <Option type="QString" value="255" name="labeling/bufferColorR"/>
-          <Option type="QString" value="false" name="labeling/bufferDraw"/>
-          <Option type="QString" value="64" name="labeling/bufferJoinStyle"/>
-          <Option type="QString" value="false" name="labeling/bufferNoFill"/>
-          <Option type="QString" value="1" name="labeling/bufferSize"/>
-          <Option type="QString" value="false" name="labeling/bufferSizeInMapUnits"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale"/>
-          <Option type="QString" value="0" name="labeling/bufferTransp"/>
-          <Option type="QString" value="false" name="labeling/centroidInside"/>
-          <Option type="QString" value="false" name="labeling/centroidWhole"/>
-          <Option type="QString" value="3" name="labeling/decimals"/>
-          <Option type="QString" value="false" name="labeling/displayAll"/>
-          <Option type="QString" value="0" name="labeling/dist"/>
-          <Option type="QString" value="false" name="labeling/distInMapUnits"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/distMapUnitScale"/>
-          <Option type="QString" value="false" name="labeling/drawLabels"/>
-          <Option type="QString" value="false" name="labeling/enabled"/>
-          <Option type="QString" value="position" name="labeling/fieldName"/>
-          <Option type="QString" value="false" name="labeling/fitInPolygonOnly"/>
-          <Option type="QString" value="0" name="labeling/fontCapitals"/>
-          <Option type="QString" value="Myriad Pro" name="labeling/fontFamily"/>
-          <Option type="QString" value="false" name="labeling/fontItalic"/>
-          <Option type="QString" value="0" name="labeling/fontLetterSpacing"/>
-          <Option type="QString" value="false" name="labeling/fontLimitPixelSize"/>
-          <Option type="QString" value="10000" name="labeling/fontMaxPixelSize"/>
-          <Option type="QString" value="3" name="labeling/fontMinPixelSize"/>
-          <Option type="QString" value="10" name="labeling/fontSize"/>
-          <Option type="QString" value="false" name="labeling/fontSizeInMapUnits"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale"/>
-          <Option type="QString" value="false" name="labeling/fontStrikeout"/>
-          <Option type="QString" value="false" name="labeling/fontUnderline"/>
-          <Option type="QString" value="63" name="labeling/fontWeight"/>
-          <Option type="QString" value="0" name="labeling/fontWordSpacing"/>
-          <Option type="QString" value="false" name="labeling/formatNumbers"/>
-          <Option type="QString" value="false" name="labeling/isExpression"/>
-          <Option type="QString" value="true" name="labeling/labelOffsetInMapUnits"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale"/>
-          <Option type="QString" value="false" name="labeling/labelPerPart"/>
-          <Option type="QString" value="&lt;" name="labeling/leftDirectionSymbol"/>
-          <Option type="QString" value="false" name="labeling/limitNumLabels"/>
-          <Option type="QString" value="20" name="labeling/maxCurvedCharAngleIn"/>
-          <Option type="QString" value="-20" name="labeling/maxCurvedCharAngleOut"/>
-          <Option type="QString" value="2000" name="labeling/maxNumLabels"/>
-          <Option type="QString" value="false" name="labeling/mergeLines"/>
-          <Option type="QString" value="0" name="labeling/minFeatureSize"/>
-          <Option type="QString" value="0" name="labeling/multilineAlign"/>
-          <Option type="QString" value="1" name="labeling/multilineHeight"/>
-          <Option type="QString" value="Semibold" name="labeling/namedStyle"/>
-          <Option type="QString" value="true" name="labeling/obstacle"/>
-          <Option type="QString" value="1" name="labeling/obstacleFactor"/>
-          <Option type="QString" value="0" name="labeling/obstacleType"/>
-          <Option type="QString" value="0" name="labeling/offsetType"/>
-          <Option type="QString" value="0" name="labeling/placeDirectionSymbol"/>
-          <Option type="QString" value="0" name="labeling/placement"/>
-          <Option type="QString" value="10" name="labeling/placementFlags"/>
-          <Option type="QString" value="false" name="labeling/plussign"/>
-          <Option type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder"/>
-          <Option type="QString" value="true" name="labeling/preserveRotation"/>
-          <Option type="QString" value="#ffffff" name="labeling/previewBkgrdColor"/>
-          <Option type="QString" value="5" name="labeling/priority"/>
-          <Option type="QString" value="4" name="labeling/quadOffset"/>
-          <Option type="QString" value="0" name="labeling/repeatDistance"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/repeatDistanceUnit"/>
-          <Option type="QString" value="false" name="labeling/reverseDirectionSymbol"/>
-          <Option type="QString" value=">" name="labeling/rightDirectionSymbol"/>
-          <Option type="QString" value="10000000" name="labeling/scaleMax"/>
-          <Option type="QString" value="1" name="labeling/scaleMin"/>
-          <Option type="QString" value="false" name="labeling/scaleVisibility"/>
-          <Option type="QString" value="6" name="labeling/shadowBlendMode"/>
-          <Option type="QString" value="0" name="labeling/shadowColorB"/>
-          <Option type="QString" value="0" name="labeling/shadowColorG"/>
-          <Option type="QString" value="0" name="labeling/shadowColorR"/>
-          <Option type="QString" value="false" name="labeling/shadowDraw"/>
-          <Option type="QString" value="135" name="labeling/shadowOffsetAngle"/>
-          <Option type="QString" value="1" name="labeling/shadowOffsetDist"/>
-          <Option type="QString" value="true" name="labeling/shadowOffsetGlobal"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shadowOffsetUnits"/>
-          <Option type="QString" value="1.5" name="labeling/shadowRadius"/>
-          <Option type="QString" value="false" name="labeling/shadowRadiusAlphaOnly"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shadowRadiusUnits"/>
-          <Option type="QString" value="100" name="labeling/shadowScale"/>
-          <Option type="QString" value="30" name="labeling/shadowTransparency"/>
-          <Option type="QString" value="0" name="labeling/shadowUnder"/>
-          <Option type="QString" value="0" name="labeling/shapeBlendMode"/>
-          <Option type="QString" value="255" name="labeling/shapeBorderColorA"/>
-          <Option type="QString" value="128" name="labeling/shapeBorderColorB"/>
-          <Option type="QString" value="128" name="labeling/shapeBorderColorG"/>
-          <Option type="QString" value="128" name="labeling/shapeBorderColorR"/>
-          <Option type="QString" value="0" name="labeling/shapeBorderWidth"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shapeBorderWidthUnits"/>
-          <Option type="QString" value="true" name="labeling/shapeDraw"/>
-          <Option type="QString" value="255" name="labeling/shapeFillColorA"/>
-          <Option type="QString" value="138" name="labeling/shapeFillColorB"/>
-          <Option type="QString" value="0" name="labeling/shapeFillColorG"/>
-          <Option type="QString" value="101" name="labeling/shapeFillColorR"/>
-          <Option type="QString" value="64" name="labeling/shapeJoinStyle"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shapeOffsetUnits"/>
-          <Option type="QString" value="0" name="labeling/shapeOffsetX"/>
-          <Option type="QString" value="0" name="labeling/shapeOffsetY"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shapeRadiiUnits"/>
-          <Option type="QString" value="0" name="labeling/shapeRadiiX"/>
-          <Option type="QString" value="0" name="labeling/shapeRadiiY"/>
-          <Option type="QString" value="0" name="labeling/shapeRotation"/>
-          <Option type="QString" value="0" name="labeling/shapeRotationType"/>
-          <Option type="QString" value="" name="labeling/shapeSVGFile"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale"/>
-          <Option type="QString" value="0" name="labeling/shapeSizeType"/>
-          <Option type="QString" value="1" name="labeling/shapeSizeUnits"/>
-          <Option type="QString" value="0" name="labeling/shapeSizeX"/>
-          <Option type="QString" value="0" name="labeling/shapeSizeY"/>
-          <Option type="QString" value="0" name="labeling/shapeTransparency"/>
-          <Option type="QString" value="0" name="labeling/shapeType"/>
-          <Option type="QString" value="255" name="labeling/textColorA"/>
-          <Option type="QString" value="255" name="labeling/textColorB"/>
-          <Option type="QString" value="255" name="labeling/textColorG"/>
-          <Option type="QString" value="255" name="labeling/textColorR"/>
-          <Option type="QString" value="0" name="labeling/textTransp"/>
-          <Option type="QString" value="0" name="labeling/upsidedownLabels"/>
-          <Option type="QString" value="" name="labeling/wrapChar"/>
-          <Option type="QString" value="0" name="labeling/xOffset"/>
-          <Option type="QString" value="0" name="labeling/yOffset"/>
-          <Option type="QString" value="0" name="labeling/zIndex"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="labeling/addDirectionSymbol" value="false" type="QString"/>
+          <Option name="labeling/angleOffset" value="0" type="QString"/>
+          <Option name="labeling/blendMode" value="0" type="QString"/>
+          <Option name="labeling/bufferBlendMode" value="0" type="QString"/>
+          <Option name="labeling/bufferColorA" value="255" type="QString"/>
+          <Option name="labeling/bufferColorB" value="255" type="QString"/>
+          <Option name="labeling/bufferColorG" value="255" type="QString"/>
+          <Option name="labeling/bufferColorR" value="255" type="QString"/>
+          <Option name="labeling/bufferDraw" value="false" type="QString"/>
+          <Option name="labeling/bufferJoinStyle" value="64" type="QString"/>
+          <Option name="labeling/bufferNoFill" value="false" type="QString"/>
+          <Option name="labeling/bufferSize" value="1" type="QString"/>
+          <Option name="labeling/bufferSizeInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/bufferTransp" value="0" type="QString"/>
+          <Option name="labeling/centroidInside" value="false" type="QString"/>
+          <Option name="labeling/centroidWhole" value="false" type="QString"/>
+          <Option name="labeling/decimals" value="3" type="QString"/>
+          <Option name="labeling/displayAll" value="false" type="QString"/>
+          <Option name="labeling/dist" value="0" type="QString"/>
+          <Option name="labeling/distInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/distMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/drawLabels" value="false" type="QString"/>
+          <Option name="labeling/enabled" value="false" type="QString"/>
+          <Option name="labeling/fieldName" value="position" type="QString"/>
+          <Option name="labeling/fitInPolygonOnly" value="false" type="QString"/>
+          <Option name="labeling/fontCapitals" value="0" type="QString"/>
+          <Option name="labeling/fontFamily" value="Myriad Pro" type="QString"/>
+          <Option name="labeling/fontItalic" value="false" type="QString"/>
+          <Option name="labeling/fontLetterSpacing" value="0" type="QString"/>
+          <Option name="labeling/fontLimitPixelSize" value="false" type="QString"/>
+          <Option name="labeling/fontMaxPixelSize" value="10000" type="QString"/>
+          <Option name="labeling/fontMinPixelSize" value="3" type="QString"/>
+          <Option name="labeling/fontSize" value="10" type="QString"/>
+          <Option name="labeling/fontSizeInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/fontStrikeout" value="false" type="QString"/>
+          <Option name="labeling/fontUnderline" value="false" type="QString"/>
+          <Option name="labeling/fontWeight" value="63" type="QString"/>
+          <Option name="labeling/fontWordSpacing" value="0" type="QString"/>
+          <Option name="labeling/formatNumbers" value="false" type="QString"/>
+          <Option name="labeling/isExpression" value="false" type="QString"/>
+          <Option name="labeling/labelOffsetInMapUnits" value="true" type="QString"/>
+          <Option name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/labelPerPart" value="false" type="QString"/>
+          <Option name="labeling/leftDirectionSymbol" value="&lt;" type="QString"/>
+          <Option name="labeling/limitNumLabels" value="false" type="QString"/>
+          <Option name="labeling/maxCurvedCharAngleIn" value="20" type="QString"/>
+          <Option name="labeling/maxCurvedCharAngleOut" value="-20" type="QString"/>
+          <Option name="labeling/maxNumLabels" value="2000" type="QString"/>
+          <Option name="labeling/mergeLines" value="false" type="QString"/>
+          <Option name="labeling/minFeatureSize" value="0" type="QString"/>
+          <Option name="labeling/multilineAlign" value="0" type="QString"/>
+          <Option name="labeling/multilineHeight" value="1" type="QString"/>
+          <Option name="labeling/namedStyle" value="Semibold" type="QString"/>
+          <Option name="labeling/obstacle" value="true" type="QString"/>
+          <Option name="labeling/obstacleFactor" value="1" type="QString"/>
+          <Option name="labeling/obstacleType" value="0" type="QString"/>
+          <Option name="labeling/offsetType" value="0" type="QString"/>
+          <Option name="labeling/placeDirectionSymbol" value="0" type="QString"/>
+          <Option name="labeling/placement" value="0" type="QString"/>
+          <Option name="labeling/placementFlags" value="10" type="QString"/>
+          <Option name="labeling/plussign" value="false" type="QString"/>
+          <Option name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString"/>
+          <Option name="labeling/preserveRotation" value="true" type="QString"/>
+          <Option name="labeling/previewBkgrdColor" value="#ffffff" type="QString"/>
+          <Option name="labeling/priority" value="5" type="QString"/>
+          <Option name="labeling/quadOffset" value="4" type="QString"/>
+          <Option name="labeling/repeatDistance" value="0" type="QString"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/repeatDistanceUnit" value="1" type="QString"/>
+          <Option name="labeling/reverseDirectionSymbol" value="false" type="QString"/>
+          <Option name="labeling/rightDirectionSymbol" value=">" type="QString"/>
+          <Option name="labeling/scaleMax" value="10000000" type="QString"/>
+          <Option name="labeling/scaleMin" value="1" type="QString"/>
+          <Option name="labeling/scaleVisibility" value="false" type="QString"/>
+          <Option name="labeling/shadowBlendMode" value="6" type="QString"/>
+          <Option name="labeling/shadowColorB" value="0" type="QString"/>
+          <Option name="labeling/shadowColorG" value="0" type="QString"/>
+          <Option name="labeling/shadowColorR" value="0" type="QString"/>
+          <Option name="labeling/shadowDraw" value="false" type="QString"/>
+          <Option name="labeling/shadowOffsetAngle" value="135" type="QString"/>
+          <Option name="labeling/shadowOffsetDist" value="1" type="QString"/>
+          <Option name="labeling/shadowOffsetGlobal" value="true" type="QString"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shadowOffsetUnits" value="1" type="QString"/>
+          <Option name="labeling/shadowRadius" value="1.5" type="QString"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" value="false" type="QString"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shadowRadiusUnits" value="1" type="QString"/>
+          <Option name="labeling/shadowScale" value="100" type="QString"/>
+          <Option name="labeling/shadowTransparency" value="30" type="QString"/>
+          <Option name="labeling/shadowUnder" value="0" type="QString"/>
+          <Option name="labeling/shapeBlendMode" value="0" type="QString"/>
+          <Option name="labeling/shapeBorderColorA" value="255" type="QString"/>
+          <Option name="labeling/shapeBorderColorB" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderColorG" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderColorR" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderWidth" value="0" type="QString"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeBorderWidthUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeDraw" value="true" type="QString"/>
+          <Option name="labeling/shapeFillColorA" value="255" type="QString"/>
+          <Option name="labeling/shapeFillColorB" value="138" type="QString"/>
+          <Option name="labeling/shapeFillColorG" value="0" type="QString"/>
+          <Option name="labeling/shapeFillColorR" value="101" type="QString"/>
+          <Option name="labeling/shapeJoinStyle" value="64" type="QString"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeOffsetUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeOffsetX" value="0" type="QString"/>
+          <Option name="labeling/shapeOffsetY" value="0" type="QString"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeRadiiUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeRadiiX" value="0" type="QString"/>
+          <Option name="labeling/shapeRadiiY" value="0" type="QString"/>
+          <Option name="labeling/shapeRotation" value="0" type="QString"/>
+          <Option name="labeling/shapeRotationType" value="0" type="QString"/>
+          <Option name="labeling/shapeSVGFile" value="" type="QString"/>
+          <Option name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeSizeType" value="0" type="QString"/>
+          <Option name="labeling/shapeSizeUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeSizeX" value="0" type="QString"/>
+          <Option name="labeling/shapeSizeY" value="0" type="QString"/>
+          <Option name="labeling/shapeTransparency" value="0" type="QString"/>
+          <Option name="labeling/shapeType" value="0" type="QString"/>
+          <Option name="labeling/textColorA" value="255" type="QString"/>
+          <Option name="labeling/textColorB" value="255" type="QString"/>
+          <Option name="labeling/textColorG" value="255" type="QString"/>
+          <Option name="labeling/textColorR" value="255" type="QString"/>
+          <Option name="labeling/textTransp" value="0" type="QString"/>
+          <Option name="labeling/upsidedownLabels" value="0" type="QString"/>
+          <Option name="labeling/wrapChar" value="" type="QString"/>
+          <Option name="labeling/xOffset" value="0" type="QString"/>
+          <Option name="labeling/yOffset" value="0" type="QString"/>
+          <Option name="labeling/zIndex" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="100000" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{444d8fb8-2321-4272-9699-88b713425993}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14478,16 +12011,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="2" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14498,8 +12031,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -14508,8 +12041,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" value="false" type="bool"/>
+                <Option name="UseHtml" value="false" type="bool"/>
               </Option>
             </config>
           </editWidget>
@@ -14518,8 +12051,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" value="false" type="bool"/>
+                <Option name="UseHtml" value="false" type="bool"/>
               </Option>
             </config>
           </editWidget>
@@ -14528,8 +12061,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -14538,8 +12071,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -14569,8 +12102,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -14627,75 +12160,91 @@ def my_form_open(dialog, layer, feature):
         <alias field="csv_last_runner" index="12" name=""/>
         <alias field="csv_instructions" index="13" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="position"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="notes"/>
+        <policy policy="Duplicate" field="xyposition"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="csv_day"/>
+        <policy policy="Duplicate" field="csv_position"/>
+        <policy policy="Duplicate" field="csv_club"/>
+        <policy policy="Duplicate" field="csv_captain"/>
+        <policy policy="Duplicate" field="csv_captain_phone"/>
+        <policy policy="Duplicate" field="csv_race"/>
+        <policy policy="Duplicate" field="csv_last_runner"/>
+        <policy policy="Duplicate" field="csv_instructions"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="notes"/>
-        <default applyOnUpdate="0" expression="" field="xyposition"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="csv_day"/>
-        <default applyOnUpdate="0" expression="" field="csv_position"/>
-        <default applyOnUpdate="0" expression="" field="csv_club"/>
-        <default applyOnUpdate="0" expression="" field="csv_captain"/>
-        <default applyOnUpdate="0" expression="" field="csv_captain_phone"/>
-        <default applyOnUpdate="0" expression="" field="csv_race"/>
-        <default applyOnUpdate="0" expression="" field="csv_last_runner"/>
-        <default applyOnUpdate="0" expression="" 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_last_runner" expression="" applyOnUpdate="0"/>
+        <default field="csv_instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="position" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="notes" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="xyposition" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="csv_day" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="csv_position" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="csv_club" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="csv_captain" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="csv_captain_phone" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="csv_race" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="csv_last_runner" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="csv_instructions" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="notes" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="xyposition" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_position" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_club" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_captain" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_captain_phone" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_race" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_last_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_instructions" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="notes"/>
-        <constraint desc="" exp="" field="xyposition"/>
-        <constraint desc="" exp="" field="day"/>
-        <constraint desc="" exp="" field="csv_day"/>
-        <constraint desc="" exp="" field="csv_position"/>
-        <constraint desc="" exp="" field="csv_club"/>
-        <constraint desc="" exp="" field="csv_captain"/>
-        <constraint desc="" exp="" field="csv_captain_phone"/>
-        <constraint desc="" exp="" field="csv_race"/>
-        <constraint desc="" exp="" field="csv_last_runner"/>
-        <constraint desc="" exp="" field="csv_instructions"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="position" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="notes" exp="" desc=""/>
+        <constraint field="xyposition" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
+        <constraint field="csv_day" exp="" desc=""/>
+        <constraint field="csv_position" exp="" desc=""/>
+        <constraint field="csv_club" exp="" desc=""/>
+        <constraint field="csv_captain" exp="" desc=""/>
+        <constraint field="csv_captain_phone" exp="" desc=""/>
+        <constraint field="csv_race" exp="" desc=""/>
+        <constraint field="csv_last_runner" exp="" desc=""/>
+        <constraint field="csv_instructions" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="position"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="notes"/>
-          <column hidden="0" type="field" width="151" name="xyposition"/>
-          <column hidden="0" type="field" width="-1" name="csv_day"/>
-          <column hidden="0" type="field" width="-1" name="csv_position"/>
-          <column hidden="0" type="field" width="-1" name="csv_club"/>
-          <column hidden="0" type="field" width="-1" name="csv_captain"/>
-          <column hidden="0" type="field" width="-1" name="csv_captain_phone"/>
-          <column hidden="0" type="field" width="-1" name="csv_race"/>
-          <column hidden="0" type="field" width="-1" name="csv_last_runner"/>
-          <column hidden="0" type="field" width="-1" name="csv_instructions"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="position" width="-1" type="field" hidden="0"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="notes" width="-1" type="field" hidden="0"/>
+          <column name="xyposition" width="151" type="field" hidden="0"/>
+          <column name="csv_day" width="-1" type="field" hidden="0"/>
+          <column name="csv_position" width="-1" type="field" hidden="0"/>
+          <column name="csv_club" width="-1" type="field" hidden="0"/>
+          <column name="csv_captain" width="-1" type="field" hidden="0"/>
+          <column name="csv_captain_phone" width="-1" type="field" hidden="0"/>
+          <column name="csv_race" width="-1" type="field" hidden="0"/>
+          <column name="csv_last_runner" width="-1" type="field" hidden="0"/>
+          <column name="csv_instructions" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14727,132 +12276,132 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="csv_10_distance"/>
-        <field editable="0" name="csv_21_distance"/>
-        <field editable="0" name="csv_Description"/>
-        <field editable="1" name="csv_capt_1"/>
-        <field editable="1" name="csv_captai"/>
-        <field editable="0" name="csv_captain"/>
-        <field editable="0" name="csv_captain_email"/>
-        <field editable="0" name="csv_captain_number"/>
-        <field editable="0" name="csv_captain_phone"/>
-        <field editable="0" name="csv_club"/>
-        <field editable="0" name="csv_day"/>
-        <field editable="0" name="csv_days"/>
-        <field editable="0" name="csv_email"/>
-        <field editable="0" name="csv_first runner"/>
-        <field editable="1" name="csv_first_"/>
-        <field editable="0" name="csv_first_runner"/>
-        <field editable="0" name="csv_firstname"/>
-        <field editable="1" name="csv_instru"/>
-        <field editable="0" name="csv_instructions"/>
-        <field editable="0" name="csv_last runner"/>
-        <field editable="1" name="csv_last_r"/>
-        <field editable="0" name="csv_last_runner"/>
-        <field editable="0" name="csv_name"/>
-        <field editable="0" name="csv_phone"/>
-        <field editable="1" name="csv_positi"/>
-        <field editable="0" name="csv_position"/>
-        <field editable="0" name="csv_race"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="0" name="csv_surname"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="0" name="marshals_by_position_captain"/>
-        <field editable="0" name="marshals_by_position_captain_phone"/>
-        <field editable="0" name="marshals_by_position_club"/>
-        <field editable="0" name="marshals_by_position_day"/>
-        <field editable="0" name="marshals_by_position_first_runner"/>
-        <field editable="0" name="marshals_by_position_instructions"/>
-        <field editable="0" name="marshals_by_position_last_runner"/>
-        <field editable="0" name="marshals_by_position_position"/>
-        <field editable="0" name="marshals_by_position_race"/>
-        <field editable="1" name="notes"/>
-        <field editable="1" name="oldpositio"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="xyposition"/>
+        <field name="csv_10_distance" editable="0"/>
+        <field name="csv_21_distance" editable="0"/>
+        <field name="csv_Description" editable="0"/>
+        <field name="csv_capt_1" editable="1"/>
+        <field name="csv_captai" editable="1"/>
+        <field name="csv_captain" editable="0"/>
+        <field name="csv_captain_email" editable="0"/>
+        <field name="csv_captain_number" editable="0"/>
+        <field name="csv_captain_phone" editable="0"/>
+        <field name="csv_club" editable="0"/>
+        <field name="csv_day" editable="0"/>
+        <field name="csv_days" editable="0"/>
+        <field name="csv_email" editable="0"/>
+        <field name="csv_first runner" editable="0"/>
+        <field name="csv_first_" editable="1"/>
+        <field name="csv_first_runner" editable="0"/>
+        <field name="csv_firstname" editable="0"/>
+        <field name="csv_instru" editable="1"/>
+        <field name="csv_instructions" editable="0"/>
+        <field name="csv_last runner" editable="0"/>
+        <field name="csv_last_r" editable="1"/>
+        <field name="csv_last_runner" editable="0"/>
+        <field name="csv_name" editable="0"/>
+        <field name="csv_phone" editable="0"/>
+        <field name="csv_positi" editable="1"/>
+        <field name="csv_position" editable="0"/>
+        <field name="csv_race" editable="0"/>
+        <field name="csv_races" editable="0"/>
+        <field name="csv_surname" editable="0"/>
+        <field name="day" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="marshals_by_position_captain" editable="0"/>
+        <field name="marshals_by_position_captain_phone" editable="0"/>
+        <field name="marshals_by_position_club" editable="0"/>
+        <field name="marshals_by_position_day" editable="0"/>
+        <field name="marshals_by_position_first_runner" editable="0"/>
+        <field name="marshals_by_position_instructions" editable="0"/>
+        <field name="marshals_by_position_last_runner" editable="0"/>
+        <field name="marshals_by_position_position" editable="0"/>
+        <field name="marshals_by_position_race" editable="0"/>
+        <field name="notes" editable="1"/>
+        <field name="oldpositio" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="csv_10_distance"/>
-        <field labelOnTop="0" name="csv_21_distance"/>
-        <field labelOnTop="0" name="csv_Description"/>
-        <field labelOnTop="0" name="csv_capt_1"/>
-        <field labelOnTop="0" name="csv_captai"/>
-        <field labelOnTop="0" name="csv_captain"/>
-        <field labelOnTop="0" name="csv_captain_email"/>
-        <field labelOnTop="0" name="csv_captain_number"/>
-        <field labelOnTop="0" name="csv_captain_phone"/>
-        <field labelOnTop="0" name="csv_club"/>
-        <field labelOnTop="0" name="csv_day"/>
-        <field labelOnTop="0" name="csv_days"/>
-        <field labelOnTop="0" name="csv_email"/>
-        <field labelOnTop="0" name="csv_first runner"/>
-        <field labelOnTop="0" name="csv_first_"/>
-        <field labelOnTop="0" name="csv_first_runner"/>
-        <field labelOnTop="0" name="csv_firstname"/>
-        <field labelOnTop="0" name="csv_instru"/>
-        <field labelOnTop="0" name="csv_instructions"/>
-        <field labelOnTop="0" name="csv_last runner"/>
-        <field labelOnTop="0" name="csv_last_r"/>
-        <field labelOnTop="0" name="csv_last_runner"/>
-        <field labelOnTop="0" name="csv_name"/>
-        <field labelOnTop="0" name="csv_phone"/>
-        <field labelOnTop="0" name="csv_positi"/>
-        <field labelOnTop="0" name="csv_position"/>
-        <field labelOnTop="0" name="csv_race"/>
-        <field labelOnTop="0" name="csv_races"/>
-        <field labelOnTop="0" name="csv_surname"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="marshals_by_position_captain"/>
-        <field labelOnTop="0" name="marshals_by_position_captain_phone"/>
-        <field labelOnTop="0" name="marshals_by_position_club"/>
-        <field labelOnTop="0" name="marshals_by_position_day"/>
-        <field labelOnTop="0" name="marshals_by_position_first_runner"/>
-        <field labelOnTop="0" name="marshals_by_position_instructions"/>
-        <field labelOnTop="0" name="marshals_by_position_last_runner"/>
-        <field labelOnTop="0" name="marshals_by_position_position"/>
-        <field labelOnTop="0" name="marshals_by_position_race"/>
-        <field labelOnTop="0" name="notes"/>
-        <field labelOnTop="0" name="oldpositio"/>
-        <field labelOnTop="0" name="position"/>
-        <field labelOnTop="0" name="type"/>
-        <field labelOnTop="0" name="xyposition"/>
+        <field name="csv_10_distance" labelOnTop="0"/>
+        <field name="csv_21_distance" labelOnTop="0"/>
+        <field name="csv_Description" labelOnTop="0"/>
+        <field name="csv_capt_1" labelOnTop="0"/>
+        <field name="csv_captai" labelOnTop="0"/>
+        <field name="csv_captain" labelOnTop="0"/>
+        <field name="csv_captain_email" labelOnTop="0"/>
+        <field name="csv_captain_number" labelOnTop="0"/>
+        <field name="csv_captain_phone" labelOnTop="0"/>
+        <field name="csv_club" labelOnTop="0"/>
+        <field name="csv_day" labelOnTop="0"/>
+        <field name="csv_days" labelOnTop="0"/>
+        <field name="csv_email" labelOnTop="0"/>
+        <field name="csv_first runner" labelOnTop="0"/>
+        <field name="csv_first_" labelOnTop="0"/>
+        <field name="csv_first_runner" labelOnTop="0"/>
+        <field name="csv_firstname" labelOnTop="0"/>
+        <field name="csv_instru" labelOnTop="0"/>
+        <field name="csv_instructions" labelOnTop="0"/>
+        <field name="csv_last runner" labelOnTop="0"/>
+        <field name="csv_last_r" labelOnTop="0"/>
+        <field name="csv_last_runner" labelOnTop="0"/>
+        <field name="csv_name" labelOnTop="0"/>
+        <field name="csv_phone" labelOnTop="0"/>
+        <field name="csv_positi" labelOnTop="0"/>
+        <field name="csv_position" labelOnTop="0"/>
+        <field name="csv_race" labelOnTop="0"/>
+        <field name="csv_races" labelOnTop="0"/>
+        <field name="csv_surname" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="marshals_by_position_captain" labelOnTop="0"/>
+        <field name="marshals_by_position_captain_phone" labelOnTop="0"/>
+        <field name="marshals_by_position_club" labelOnTop="0"/>
+        <field name="marshals_by_position_day" labelOnTop="0"/>
+        <field name="marshals_by_position_first_runner" labelOnTop="0"/>
+        <field name="marshals_by_position_instructions" labelOnTop="0"/>
+        <field name="marshals_by_position_last_runner" labelOnTop="0"/>
+        <field name="marshals_by_position_position" labelOnTop="0"/>
+        <field name="marshals_by_position_race" labelOnTop="0"/>
+        <field name="notes" labelOnTop="0"/>
+        <field name="oldpositio" labelOnTop="0"/>
+        <field name="position" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+        <field name="xyposition" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="csv_captain"/>
-        <field reuseLastValue="0" name="csv_captain_email"/>
-        <field reuseLastValue="0" name="csv_captain_phone"/>
-        <field reuseLastValue="0" name="csv_club"/>
-        <field reuseLastValue="0" name="csv_day"/>
-        <field reuseLastValue="0" name="csv_days"/>
-        <field reuseLastValue="0" name="csv_email"/>
-        <field reuseLastValue="0" name="csv_first_runner"/>
-        <field reuseLastValue="0" name="csv_firstname"/>
-        <field reuseLastValue="0" name="csv_instructions"/>
-        <field reuseLastValue="0" name="csv_last_runner"/>
-        <field reuseLastValue="0" name="csv_name"/>
-        <field reuseLastValue="0" name="csv_phone"/>
-        <field reuseLastValue="0" name="csv_position"/>
-        <field reuseLastValue="0" name="csv_race"/>
-        <field reuseLastValue="0" name="csv_races"/>
-        <field reuseLastValue="0" name="csv_surname"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="marshals_by_position_captain"/>
-        <field reuseLastValue="0" name="marshals_by_position_captain_phone"/>
-        <field reuseLastValue="0" name="marshals_by_position_club"/>
-        <field reuseLastValue="0" name="marshals_by_position_day"/>
-        <field reuseLastValue="0" name="marshals_by_position_first_runner"/>
-        <field reuseLastValue="0" name="marshals_by_position_instructions"/>
-        <field reuseLastValue="0" name="marshals_by_position_last_runner"/>
-        <field reuseLastValue="0" name="marshals_by_position_position"/>
-        <field reuseLastValue="0" name="marshals_by_position_race"/>
-        <field reuseLastValue="0" name="notes"/>
-        <field reuseLastValue="0" name="position"/>
-        <field reuseLastValue="0" name="type"/>
-        <field reuseLastValue="0" name="xyposition"/>
+        <field name="csv_captain" reuseLastValue="0"/>
+        <field name="csv_captain_email" reuseLastValue="0"/>
+        <field name="csv_captain_phone" reuseLastValue="0"/>
+        <field name="csv_club" reuseLastValue="0"/>
+        <field name="csv_day" reuseLastValue="0"/>
+        <field name="csv_days" reuseLastValue="0"/>
+        <field name="csv_email" reuseLastValue="0"/>
+        <field name="csv_first_runner" reuseLastValue="0"/>
+        <field name="csv_firstname" reuseLastValue="0"/>
+        <field name="csv_instructions" reuseLastValue="0"/>
+        <field name="csv_last_runner" reuseLastValue="0"/>
+        <field name="csv_name" reuseLastValue="0"/>
+        <field name="csv_phone" reuseLastValue="0"/>
+        <field name="csv_position" reuseLastValue="0"/>
+        <field name="csv_race" reuseLastValue="0"/>
+        <field name="csv_races" reuseLastValue="0"/>
+        <field name="csv_surname" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="marshals_by_position_captain" reuseLastValue="0"/>
+        <field name="marshals_by_position_captain_phone" reuseLastValue="0"/>
+        <field name="marshals_by_position_club" reuseLastValue="0"/>
+        <field name="marshals_by_position_day" reuseLastValue="0"/>
+        <field name="marshals_by_position_first_runner" reuseLastValue="0"/>
+        <field name="marshals_by_position_instructions" reuseLastValue="0"/>
+        <field name="marshals_by_position_last_runner" reuseLastValue="0"/>
+        <field name="marshals_by_position_position" reuseLastValue="0"/>
+        <field name="marshals_by_position_race" reuseLastValue="0"/>
+        <field name="notes" reuseLastValue="0"/>
+        <field name="position" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
+        <field name="xyposition" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -14902,7 +12451,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer maxScale="100000" legendPlaceholderImage="" geometry="No geometry" autoRefreshTime="0" readOnly="0" type="vector" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" minScale="1e+08" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" wkbType="NoGeometry">
+    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" styleCategories="AllStyleCategories" readOnly="0" maxScale="100000" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="vector" geometry="No geometry" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="NoGeometry" minScale="1e+08">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -14939,6 +12488,7 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -14955,7 +12505,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14980,195 +12530,138 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="243,166,178,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="243,166,178,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="243,166,178,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="243,166,178,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="174,119,127,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="243,166,178,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="174,119,127,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="243,166,178,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="174,119,127,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{2e75a471-0eec-4801-8821-18a2e0a21c45}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="243,166,178,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="174,119,127,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="243,166,178,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="174,119,127,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="243,166,178,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="174,119,127,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15177,18 +12670,18 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="first_name"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="first_name" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -15206,8 +12699,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -15230,8 +12723,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -15254,8 +12747,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -15311,71 +12804,86 @@ def my_form_open(dialog, layer, feature):
         <alias field="last_runner" index="11" name=""/>
         <alias field="instructions" index="12" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="position"/>
+        <policy policy="Duplicate" field="first_name"/>
+        <policy policy="Duplicate" field="surname"/>
+        <policy policy="Duplicate" field="club"/>
+        <policy policy="Duplicate" field="phone"/>
+        <policy policy="Duplicate" field="email"/>
+        <policy policy="Duplicate" field="captain"/>
+        <policy policy="Duplicate" field="captain_phone"/>
+        <policy policy="Duplicate" field="race"/>
+        <policy policy="Duplicate" field="first_runner"/>
+        <policy policy="Duplicate" field="last_runner"/>
+        <policy policy="Duplicate" field="instructions"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="first_name"/>
-        <default applyOnUpdate="0" expression="" field="surname"/>
-        <default applyOnUpdate="0" expression="" field="club"/>
-        <default applyOnUpdate="0" expression="" field="phone"/>
-        <default applyOnUpdate="0" expression="" field="email"/>
-        <default applyOnUpdate="0" expression="" field="captain"/>
-        <default applyOnUpdate="0" expression="" field="captain_phone"/>
-        <default applyOnUpdate="0" expression="" field="race"/>
-        <default applyOnUpdate="0" expression="" field="first_runner"/>
-        <default applyOnUpdate="0" expression="" field="last_runner"/>
-        <default applyOnUpdate="0" expression="" field="instructions"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="first_name" expression="" applyOnUpdate="0"/>
+        <default field="surname" expression="" applyOnUpdate="0"/>
+        <default field="club" expression="" applyOnUpdate="0"/>
+        <default field="phone" expression="" applyOnUpdate="0"/>
+        <default field="email" 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="instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="position" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="first_name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="surname" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="club" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="phone" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="email" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="captain" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="captain_phone" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="race" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="first_runner" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="last_runner" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="instructions" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="first_name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="surname" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="club" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="phone" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="email" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="captain" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="captain_phone" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="race" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="first_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="last_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="instructions" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="day"/>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="first_name"/>
-        <constraint desc="" exp="" field="surname"/>
-        <constraint desc="" exp="" field="club"/>
-        <constraint desc="" exp="" field="phone"/>
-        <constraint desc="" exp="" field="email"/>
-        <constraint desc="" exp="" field="captain"/>
-        <constraint desc="" exp="" field="captain_phone"/>
-        <constraint desc="" exp="" field="race"/>
-        <constraint desc="" exp="" field="first_runner"/>
-        <constraint desc="" exp="" field="last_runner"/>
-        <constraint desc="" exp="" field="instructions"/>
+        <constraint field="day" exp="" desc=""/>
+        <constraint field="position" exp="" desc=""/>
+        <constraint field="first_name" exp="" desc=""/>
+        <constraint field="surname" exp="" desc=""/>
+        <constraint field="club" exp="" desc=""/>
+        <constraint field="phone" exp="" desc=""/>
+        <constraint field="email" exp="" desc=""/>
+        <constraint field="captain" exp="" desc=""/>
+        <constraint field="captain_phone" exp="" desc=""/>
+        <constraint field="race" exp="" desc=""/>
+        <constraint field="first_runner" exp="" desc=""/>
+        <constraint field="last_runner" exp="" desc=""/>
+        <constraint field="instructions" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="position"/>
-          <column hidden="0" type="field" width="-1" name="club"/>
-          <column hidden="0" type="field" width="-1" name="phone"/>
-          <column hidden="0" type="field" width="-1" name="email"/>
-          <column hidden="0" type="field" width="-1" name="captain"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="first_runner"/>
-          <column hidden="0" type="field" width="-1" name="last_runner"/>
-          <column hidden="0" type="field" width="-1" name="instructions"/>
-          <column hidden="0" type="field" width="-1" name="surname"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
-          <column hidden="0" type="field" width="-1" name="first_name"/>
-          <column hidden="0" type="field" width="-1" name="race"/>
-          <column hidden="0" type="field" width="-1" name="captain_phone"/>
+          <column name="position" width="-1" type="field" hidden="0"/>
+          <column name="club" width="-1" type="field" hidden="0"/>
+          <column name="phone" width="-1" type="field" hidden="0"/>
+          <column name="email" width="-1" type="field" hidden="0"/>
+          <column name="captain" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="first_runner" width="-1" type="field" hidden="0"/>
+          <column name="last_runner" width="-1" type="field" hidden="0"/>
+          <column name="instructions" width="-1" type="field" hidden="0"/>
+          <column name="surname" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="first_name" width="-1" type="field" hidden="0"/>
+          <column name="race" width="-1" type="field" hidden="0"/>
+          <column name="captain_phone" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15407,76 +12915,76 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="10_distance"/>
-        <field editable="1" name="21_distance"/>
-        <field editable="1" name="5_distance"/>
-        <field editable="1" name="captain"/>
-        <field editable="1" name="captain_email"/>
-        <field editable="1" name="captain_number"/>
-        <field editable="1" name="captain_phone"/>
-        <field editable="1" name="club"/>
-        <field editable="1" name="days"/>
-        <field editable="1" name="email"/>
-        <field editable="1" name="first_name"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="firstname"/>
-        <field editable="1" name="instructions"/>
-        <field editable="1" name="last_name"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="phone"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="surname"/>
-        <field editable="1" name="tshirt"/>
+        <field name="10_distance" editable="1"/>
+        <field name="21_distance" editable="1"/>
+        <field name="5_distance" editable="1"/>
+        <field name="captain" editable="1"/>
+        <field name="captain_email" editable="1"/>
+        <field name="captain_number" editable="1"/>
+        <field name="captain_phone" editable="1"/>
+        <field name="club" editable="1"/>
+        <field name="days" editable="1"/>
+        <field name="email" editable="1"/>
+        <field name="first_name" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="firstname" editable="1"/>
+        <field name="instructions" editable="1"/>
+        <field name="last_name" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="phone" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="surname" editable="1"/>
+        <field name="tshirt" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="10_distance"/>
-        <field labelOnTop="0" name="21_distance"/>
-        <field labelOnTop="0" name="5_distance"/>
-        <field labelOnTop="0" name="captain"/>
-        <field labelOnTop="0" name="captain_email"/>
-        <field labelOnTop="0" name="captain_number"/>
-        <field labelOnTop="0" name="captain_phone"/>
-        <field labelOnTop="0" name="club"/>
-        <field labelOnTop="0" name="days"/>
-        <field labelOnTop="0" name="email"/>
-        <field labelOnTop="0" name="first_name"/>
-        <field labelOnTop="0" name="first_runner"/>
-        <field labelOnTop="0" name="firstname"/>
-        <field labelOnTop="0" name="instructions"/>
-        <field labelOnTop="0" name="last_name"/>
-        <field labelOnTop="0" name="last_runner"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="phone"/>
-        <field labelOnTop="0" name="position"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="surname"/>
-        <field labelOnTop="0" name="tshirt"/>
+        <field name="10_distance" labelOnTop="0"/>
+        <field name="21_distance" labelOnTop="0"/>
+        <field name="5_distance" labelOnTop="0"/>
+        <field name="captain" labelOnTop="0"/>
+        <field name="captain_email" labelOnTop="0"/>
+        <field name="captain_number" labelOnTop="0"/>
+        <field name="captain_phone" labelOnTop="0"/>
+        <field name="club" labelOnTop="0"/>
+        <field name="days" labelOnTop="0"/>
+        <field name="email" labelOnTop="0"/>
+        <field name="first_name" labelOnTop="0"/>
+        <field name="first_runner" labelOnTop="0"/>
+        <field name="firstname" labelOnTop="0"/>
+        <field name="instructions" labelOnTop="0"/>
+        <field name="last_name" labelOnTop="0"/>
+        <field name="last_runner" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="phone" labelOnTop="0"/>
+        <field name="position" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="surname" labelOnTop="0"/>
+        <field name="tshirt" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="captain"/>
-        <field reuseLastValue="0" name="captain_email"/>
-        <field reuseLastValue="0" name="captain_phone"/>
-        <field reuseLastValue="0" name="club"/>
-        <field reuseLastValue="0" name="days"/>
-        <field reuseLastValue="0" name="email"/>
-        <field reuseLastValue="0" name="first_runner"/>
-        <field reuseLastValue="0" name="firstname"/>
-        <field reuseLastValue="0" name="instructions"/>
-        <field reuseLastValue="0" name="last_runner"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="phone"/>
-        <field reuseLastValue="0" name="position"/>
-        <field reuseLastValue="0" name="races"/>
-        <field reuseLastValue="0" name="surname"/>
+        <field name="captain" reuseLastValue="0"/>
+        <field name="captain_email" reuseLastValue="0"/>
+        <field name="captain_phone" reuseLastValue="0"/>
+        <field name="club" reuseLastValue="0"/>
+        <field name="days" reuseLastValue="0"/>
+        <field name="email" reuseLastValue="0"/>
+        <field name="first_runner" reuseLastValue="0"/>
+        <field name="firstname" reuseLastValue="0"/>
+        <field name="instructions" reuseLastValue="0"/>
+        <field name="last_runner" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="phone" reuseLastValue="0"/>
+        <field name="position" reuseLastValue="0"/>
+        <field name="races" reuseLastValue="0"/>
+        <field name="surname" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -15525,23 +13033,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15566,476 +13075,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="141,90,153,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="141,90,153,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="141,90,153,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{5970f832-e8d3-481a-8cf9-9744ea98d012}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="141,90,153,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="101,64,109,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="141,90,153,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="101,64,109,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="141,90,153,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="101,64,109,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{8d4290c3-b722-4503-bba9-f0f83dceef08}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="141,90,153,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="101,64,109,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="141,90,153,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="101,64,109,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="141,90,153,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="101,64,109,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car"/>
-          <rule symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking"/>
+          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" label="Car"/>
+          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" label="Walking"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{743d2826-031c-45d5-809e-09f032abdd16}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="123,211,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="1" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="123,211,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="123,211,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="1" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="flat" name="capstyle"/>
-                <Option type="QString" value="4;1;1;1" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="103,34,144,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="1.25" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="1" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="4;1;1;1" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1.25" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="flat" k="capstyle"/>
-              <prop v="4;1;1;1" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1.25" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@1@1" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="103,34,144,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="5" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="5" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@1@1@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{03389801-e1b4-43c1-bed5-409ab2a31647}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="103,34,144,255" name="color"/>
-                        <Option type="QString" value="miter" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="no" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="miter" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -16048,93 +13407,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="id" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" italic="1" style="0" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16142,16 +13474,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16177,27 +13509,31 @@ def my_form_open(dialog, layer, feature):
         <alias field="id" index="0" name=""/>
         <alias field="type" index="1" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="type"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16229,12 +13565,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16242,7 +13578,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="Point" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" refreshOnNotifyMessage="" geometry="Point" styleCategories="AllStyleCategories">
+    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -16291,23 +13627,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16332,429 +13669,334 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="232,113,141,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="232,113,141,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="232,113,141,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="232,113,141,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="166,81,101,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="232,113,141,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="166,81,101,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="232,113,141,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="166,81,101,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="232,113,141,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="166,81,101,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="232,113,141,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="166,81,101,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="232,113,141,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="166,81,101,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Regular" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.75" fontWordSpacing="0" textOrientation="horizontal" fontSize="8.5" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="0.75" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="name" fontSize="8.5" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1.5" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSize="1.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="LabelRotation">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
-                    <Option type="int" value="3" name="type"/>
+                <Option name="name" value="" type="QString"/>
+                <Option name="properties" type="Map">
+                  <Option name="LabelRotation" type="Map">
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
-                  <Option type="Map" name="PositionX">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="label_x" name="field"/>
-                    <Option type="int" value="2" name="type"/>
+                  <Option name="PositionX" type="Map">
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="field" value="label_x" type="QString"/>
+                    <Option name="type" value="2" type="int"/>
                   </Option>
-                  <Option type="Map" name="PositionY">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="label_y" name="field"/>
-                    <Option type="int" value="2" name="type"/>
+                  <Option name="PositionY" type="Map">
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="field" value="label_y" type="QString"/>
+                    <Option name="type" value="2" type="int"/>
                   </Option>
-                  <Option type="Map" name="Size">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression"/>
-                    <Option type="int" value="3" name="type"/>
+                  <Option name="Size" type="Map">
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                 </Option>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-          <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="1" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-          <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="0.20000000000000001" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="1" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="2" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+          <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="0.20000000000000001" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="LabelRotation" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="label_x" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="PositionX" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="label_x" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="label_y" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="PositionY" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="label_y" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-              <Option type="int" value="0" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-              <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-              <Option type="double" value="0" name="minLength"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-              <Option type="QString" value="MM" name="minLengthUnit"/>
-              <Option type="double" value="0" name="offsetFromAnchor"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-              <Option type="double" value="0" name="offsetFromLabel"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="&quot;name&quot;" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="&quot;name&quot;" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="100000" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16762,16 +14004,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="2" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16782,8 +14024,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16792,8 +14034,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16802,8 +14044,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16812,8 +14054,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16822,8 +14064,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16832,8 +14074,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16842,8 +14084,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16852,8 +14094,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16862,8 +14104,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16880,55 +14122,66 @@ def my_form_open(dialog, layer, feature):
         <alias field="label_y" index="7" name=""/>
         <alias field="label_rota" index="8" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="osm_id"/>
+        <policy policy="Duplicate" field="name"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="z_order"/>
+        <policy policy="Duplicate" field="population"/>
+        <policy policy="Duplicate" field="label_x"/>
+        <policy policy="Duplicate" field="label_y"/>
+        <policy policy="Duplicate" field="label_rota"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="osm_id"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="z_order"/>
-        <default applyOnUpdate="0" expression="" field="population"/>
-        <default applyOnUpdate="0" expression="" field="label_x"/>
-        <default applyOnUpdate="0" expression="" field="label_y"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="osm_id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="z_order" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="population" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="label_x" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="label_y" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="label_rota" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="osm_id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="z_order" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="population" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_x" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_y" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_rota" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="osm_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="z_order"/>
-        <constraint desc="" exp="" field="population"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rota"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="osm_id" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="z_order" exp="" desc=""/>
+        <constraint field="population" exp="" desc=""/>
+        <constraint field="label_x" exp="" desc=""/>
+        <constraint field="label_y" exp="" desc=""/>
+        <constraint field="label_rota" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="osm_id"/>
-          <column hidden="0" type="field" width="-1" name="name"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="z_order"/>
-          <column hidden="0" type="field" width="-1" name="population"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="label_x"/>
-          <column hidden="0" type="field" width="-1" name="label_y"/>
-          <column hidden="0" type="field" width="-1" name="label_rota"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="osm_id" width="-1" type="field" hidden="0"/>
+          <column name="name" width="-1" type="field" hidden="0"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="z_order" width="-1" type="field" hidden="0"/>
+          <column name="population" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="label_x" width="-1" type="field" hidden="0"/>
+          <column name="label_y" width="-1" type="field" hidden="0"/>
+          <column name="label_rota" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16960,26 +14213,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="population"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="z_order"/>
+        <field name="id" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="osm_id" editable="1"/>
+        <field name="population" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label_rota"/>
-        <field labelOnTop="0" name="label_x"/>
-        <field labelOnTop="0" name="label_y"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="osm_id"/>
-        <field labelOnTop="0" name="population"/>
-        <field labelOnTop="0" name="type"/>
-        <field labelOnTop="0" name="z_order"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label_rota" labelOnTop="0"/>
+        <field name="label_x" labelOnTop="0"/>
+        <field name="label_y" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="osm_id" labelOnTop="0"/>
+        <field name="population" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+        <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16987,7 +14240,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -17036,23 +14289,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17077,496 +14331,382 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="255,158,23,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="255,158,23,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,158,23,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,158,23,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="182,113,16,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,158,23,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="182,113,16,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,158,23,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="182,113,16,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{354d4d11-8126-426c-b325-0776a64e32e3}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="255,158,23,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="182,113,16,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="255,158,23,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="182,113,16,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="255,158,23,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="182,113,16,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Regular" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.80000000000000004" fontWordSpacing="0" textOrientation="horizontal" fontSize="7" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="0.80000000000000004" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSize="7" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="1" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="196,60,57,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="196,60,57,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="196,60,57,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-          <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="3" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="LineGeometry" repeatDistanceUnits="MapUnit" repeatDistance="0" placementFlags="4" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="3" offsetType="0" centroidWhole="0" allowDegraded="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-          <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="5" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="0.29999999999999999" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="1"/>
+          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="3" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" placement="3" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="4" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+          <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="1" obstacleFactor="0.29999999999999999" minFeatureSize="5" drawLabels="1" obstacleType="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="AlwaysShow">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="always_sho" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="AlwaysShow" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="always_sho" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="IsObstacle">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="&quot;&quot;" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="IsObstacle" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="&quot;&quot;" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="LabelRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="LabelRotation" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="label_x" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="PositionX" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="label_x" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="label_y" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="PositionY" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="label_y" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="Priority">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                <Option name="Priority" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
-                <Option type="Map" name="Show">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="auxiliary_storage_labeling_show" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="Show" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="auxiliary_storage_labeling_show" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-              <Option type="int" value="0" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-              <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-              <Option type="double" value="0" name="minLength"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-              <Option type="QString" value="MM" name="minLengthUnit"/>
-              <Option type="double" value="0" name="offsetFromAnchor"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-              <Option type="double" value="0" name="offsetFromLabel"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="100000" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17574,16 +14714,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="2" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17594,8 +14734,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -17604,8 +14744,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -17649,8 +14789,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -17730,83 +14870,101 @@ def my_form_open(dialog, layer, feature):
         <alias field="resident_a" index="14" name=""/>
         <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="osm_id"/>
+        <policy policy="Duplicate" field="name"/>
+        <policy policy="Duplicate" field="highway"/>
+        <policy policy="Duplicate" field="waterway"/>
+        <policy policy="Duplicate" field="aerialway"/>
+        <policy policy="Duplicate" field="barrier"/>
+        <policy policy="Duplicate" field="man_made"/>
+        <policy policy="Duplicate" field="z_order"/>
+        <policy policy="Duplicate" field="other_tags"/>
+        <policy policy="Duplicate" field="never_show"/>
+        <policy policy="Duplicate" field="label_x"/>
+        <policy policy="Duplicate" field="label_y"/>
+        <policy policy="Duplicate" field="label_rota"/>
+        <policy policy="Duplicate" field="always_sho"/>
+        <policy policy="Duplicate" field="resident_a"/>
+        <policy policy="Duplicate" field="auxiliary_storage_labeling_show"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="osm_id"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="highway"/>
-        <default applyOnUpdate="0" expression="" field="waterway"/>
-        <default applyOnUpdate="0" expression="" field="aerialway"/>
-        <default applyOnUpdate="0" expression="" field="barrier"/>
-        <default applyOnUpdate="0" expression="" field="man_made"/>
-        <default applyOnUpdate="0" expression="" field="z_order"/>
-        <default applyOnUpdate="0" expression="" field="other_tags"/>
-        <default applyOnUpdate="0" expression="" field="never_show"/>
-        <default applyOnUpdate="0" expression="" field="label_x"/>
-        <default applyOnUpdate="0" expression="" field="label_y"/>
-        <default applyOnUpdate="0" expression="" field="label_rota"/>
-        <default applyOnUpdate="0" expression="" field="always_sho"/>
-        <default applyOnUpdate="0" expression="" field="resident_a"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="osm_id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="highway" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="waterway" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="aerialway" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="barrier" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="man_made" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="z_order" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="other_tags" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="never_show" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="label_x" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="label_y" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="label_rota" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="always_sho" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="resident_a" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="auxiliary_storage_labeling_show" exp_strength="0"/>
+        <constraint unique_strength="0" field="osm_id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="highway" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="waterway" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="aerialway" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="barrier" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="man_made" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="z_order" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="other_tags" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="never_show" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_x" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_y" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_rota" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="always_sho" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="resident_a" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="auxiliary_storage_labeling_show" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="osm_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="highway"/>
-        <constraint desc="" exp="" field="waterway"/>
-        <constraint desc="" exp="" field="aerialway"/>
-        <constraint desc="" exp="" field="barrier"/>
-        <constraint desc="" exp="" field="man_made"/>
-        <constraint desc="" exp="" field="z_order"/>
-        <constraint desc="" exp="" field="other_tags"/>
-        <constraint desc="" exp="" field="never_show"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rota"/>
-        <constraint desc="" exp="" field="always_sho"/>
-        <constraint desc="" exp="" field="resident_a"/>
-        <constraint desc="" exp="" field="auxiliary_storage_labeling_show"/>
+        <constraint field="osm_id" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="highway" exp="" desc=""/>
+        <constraint field="waterway" exp="" desc=""/>
+        <constraint field="aerialway" exp="" desc=""/>
+        <constraint field="barrier" exp="" desc=""/>
+        <constraint field="man_made" exp="" desc=""/>
+        <constraint field="z_order" exp="" desc=""/>
+        <constraint field="other_tags" exp="" desc=""/>
+        <constraint field="never_show" exp="" desc=""/>
+        <constraint field="label_x" exp="" desc=""/>
+        <constraint field="label_y" exp="" desc=""/>
+        <constraint field="label_rota" exp="" desc=""/>
+        <constraint field="always_sho" exp="" desc=""/>
+        <constraint field="resident_a" exp="" desc=""/>
+        <constraint field="auxiliary_storage_labeling_show" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;osm_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="osm_id"/>
-          <column hidden="0" type="field" width="160" name="name"/>
-          <column hidden="0" type="field" width="-1" name="z_order"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="highway"/>
-          <column hidden="0" type="field" width="-1" name="waterway"/>
-          <column hidden="0" type="field" width="-1" name="aerialway"/>
-          <column hidden="0" type="field" width="-1" name="barrier"/>
-          <column hidden="0" type="field" width="-1" name="man_made"/>
-          <column hidden="0" type="field" width="142" name="other_tags"/>
-          <column hidden="0" type="field" width="-1" name="never_show"/>
-          <column hidden="0" type="field" width="-1" name="label_x"/>
-          <column hidden="0" type="field" width="-1" name="label_y"/>
-          <column hidden="0" type="field" width="-1" name="label_rota"/>
-          <column hidden="0" type="field" width="-1" name="always_sho"/>
-          <column hidden="0" type="field" width="-1" name="resident_a"/>
-          <column hidden="0" type="field" width="-1" name="auxiliary_storage_labeling_show"/>
+          <column name="osm_id" width="-1" type="field" hidden="0"/>
+          <column name="name" width="160" type="field" hidden="0"/>
+          <column name="z_order" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="highway" width="-1" type="field" hidden="0"/>
+          <column name="waterway" width="-1" type="field" hidden="0"/>
+          <column name="aerialway" width="-1" type="field" hidden="0"/>
+          <column name="barrier" width="-1" type="field" hidden="0"/>
+          <column name="man_made" width="-1" type="field" hidden="0"/>
+          <column name="other_tags" width="142" type="field" hidden="0"/>
+          <column name="never_show" width="-1" type="field" hidden="0"/>
+          <column name="label_x" width="-1" type="field" hidden="0"/>
+          <column name="label_y" width="-1" type="field" hidden="0"/>
+          <column name="label_rota" width="-1" type="field" hidden="0"/>
+          <column name="always_sho" width="-1" type="field" hidden="0"/>
+          <column name="resident_a" width="-1" type="field" hidden="0"/>
+          <column name="auxiliary_storage_labeling_show" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17838,94 +14996,94 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="aerialway"/>
-        <field editable="1" name="always_sho"/>
-        <field editable="0" name="auxiliary_storage_labeling_show"/>
-        <field editable="1" name="barrier"/>
-        <field editable="1" name="highway"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="man_made"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="never_show"/>
-        <field editable="0" name="orig_access"/>
-        <field editable="0" name="orig_always_sho"/>
-        <field editable="0" name="orig_bridge"/>
-        <field editable="0" name="orig_c_z_order"/>
-        <field editable="0" name="orig_class"/>
-        <field editable="0" name="orig_id"/>
-        <field editable="0" name="orig_label_rota"/>
-        <field editable="0" name="orig_label_x"/>
-        <field editable="0" name="orig_label_y"/>
-        <field editable="0" name="orig_name"/>
-        <field editable="0" name="orig_oneway"/>
-        <field editable="0" name="orig_ref"/>
-        <field editable="0" name="orig_service"/>
-        <field editable="0" name="orig_show"/>
-        <field editable="0" name="orig_tunnel"/>
-        <field editable="0" name="orig_type"/>
-        <field editable="0" name="orig_z_order"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="other_tags"/>
-        <field editable="1" name="resident_a"/>
-        <field editable="1" name="resident_access"/>
-        <field editable="1" name="waterway"/>
-        <field editable="1" name="z_order"/>
+        <field name="aerialway" editable="1"/>
+        <field name="always_sho" editable="1"/>
+        <field name="auxiliary_storage_labeling_show" editable="0"/>
+        <field name="barrier" editable="1"/>
+        <field name="highway" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="man_made" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="never_show" editable="1"/>
+        <field name="orig_access" editable="0"/>
+        <field name="orig_always_sho" editable="0"/>
+        <field name="orig_bridge" editable="0"/>
+        <field name="orig_c_z_order" editable="0"/>
+        <field name="orig_class" editable="0"/>
+        <field name="orig_id" editable="0"/>
+        <field name="orig_label_rota" editable="0"/>
+        <field name="orig_label_x" editable="0"/>
+        <field name="orig_label_y" editable="0"/>
+        <field name="orig_name" editable="0"/>
+        <field name="orig_oneway" editable="0"/>
+        <field name="orig_ref" editable="0"/>
+        <field name="orig_service" editable="0"/>
+        <field name="orig_show" editable="0"/>
+        <field name="orig_tunnel" editable="0"/>
+        <field name="orig_type" editable="0"/>
+        <field name="orig_z_order" editable="0"/>
+        <field name="osm_id" editable="1"/>
+        <field name="other_tags" editable="1"/>
+        <field name="resident_a" editable="1"/>
+        <field name="resident_access" editable="1"/>
+        <field name="waterway" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="aerialway"/>
-        <field labelOnTop="0" name="always_sho"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_show"/>
-        <field labelOnTop="0" name="barrier"/>
-        <field labelOnTop="0" name="highway"/>
-        <field labelOnTop="0" name="label_rota"/>
-        <field labelOnTop="0" name="label_x"/>
-        <field labelOnTop="0" name="label_y"/>
-        <field labelOnTop="0" name="man_made"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="never_show"/>
-        <field labelOnTop="0" name="orig_access"/>
-        <field labelOnTop="0" name="orig_always_sho"/>
-        <field labelOnTop="0" name="orig_bridge"/>
-        <field labelOnTop="0" name="orig_c_z_order"/>
-        <field labelOnTop="0" name="orig_class"/>
-        <field labelOnTop="0" name="orig_id"/>
-        <field labelOnTop="0" name="orig_label_rota"/>
-        <field labelOnTop="0" name="orig_label_x"/>
-        <field labelOnTop="0" name="orig_label_y"/>
-        <field labelOnTop="0" name="orig_name"/>
-        <field labelOnTop="0" name="orig_oneway"/>
-        <field labelOnTop="0" name="orig_ref"/>
-        <field labelOnTop="0" name="orig_service"/>
-        <field labelOnTop="0" name="orig_show"/>
-        <field labelOnTop="0" name="orig_tunnel"/>
-        <field labelOnTop="0" name="orig_type"/>
-        <field labelOnTop="0" name="orig_z_order"/>
-        <field labelOnTop="0" name="osm_id"/>
-        <field labelOnTop="0" name="other_tags"/>
-        <field labelOnTop="0" name="resident_a"/>
-        <field labelOnTop="0" name="resident_access"/>
-        <field labelOnTop="0" name="waterway"/>
-        <field labelOnTop="0" name="z_order"/>
+        <field name="aerialway" labelOnTop="0"/>
+        <field name="always_sho" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_show" labelOnTop="0"/>
+        <field name="barrier" labelOnTop="0"/>
+        <field name="highway" labelOnTop="0"/>
+        <field name="label_rota" labelOnTop="0"/>
+        <field name="label_x" labelOnTop="0"/>
+        <field name="label_y" labelOnTop="0"/>
+        <field name="man_made" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="never_show" labelOnTop="0"/>
+        <field name="orig_access" labelOnTop="0"/>
+        <field name="orig_always_sho" labelOnTop="0"/>
+        <field name="orig_bridge" labelOnTop="0"/>
+        <field name="orig_c_z_order" labelOnTop="0"/>
+        <field name="orig_class" labelOnTop="0"/>
+        <field name="orig_id" labelOnTop="0"/>
+        <field name="orig_label_rota" labelOnTop="0"/>
+        <field name="orig_label_x" labelOnTop="0"/>
+        <field name="orig_label_y" labelOnTop="0"/>
+        <field name="orig_name" labelOnTop="0"/>
+        <field name="orig_oneway" labelOnTop="0"/>
+        <field name="orig_ref" labelOnTop="0"/>
+        <field name="orig_service" labelOnTop="0"/>
+        <field name="orig_show" labelOnTop="0"/>
+        <field name="orig_tunnel" labelOnTop="0"/>
+        <field name="orig_type" labelOnTop="0"/>
+        <field name="orig_z_order" labelOnTop="0"/>
+        <field name="osm_id" labelOnTop="0"/>
+        <field name="other_tags" labelOnTop="0"/>
+        <field name="resident_a" labelOnTop="0"/>
+        <field name="resident_access" labelOnTop="0"/>
+        <field name="waterway" labelOnTop="0"/>
+        <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="aerialway"/>
-        <field reuseLastValue="0" name="always_sho"/>
-        <field reuseLastValue="0" name="auxiliary_storage_labeling_show"/>
-        <field reuseLastValue="0" name="barrier"/>
-        <field reuseLastValue="0" name="highway"/>
-        <field reuseLastValue="0" name="label_rota"/>
-        <field reuseLastValue="0" name="label_x"/>
-        <field reuseLastValue="0" name="label_y"/>
-        <field reuseLastValue="0" name="man_made"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="never_show"/>
-        <field reuseLastValue="0" name="osm_id"/>
-        <field reuseLastValue="0" name="other_tags"/>
-        <field reuseLastValue="0" name="resident_a"/>
-        <field reuseLastValue="0" name="waterway"/>
-        <field reuseLastValue="0" name="z_order"/>
+        <field name="aerialway" reuseLastValue="0"/>
+        <field name="always_sho" reuseLastValue="0"/>
+        <field name="auxiliary_storage_labeling_show" reuseLastValue="0"/>
+        <field name="barrier" reuseLastValue="0"/>
+        <field name="highway" reuseLastValue="0"/>
+        <field name="label_rota" reuseLastValue="0"/>
+        <field name="label_x" reuseLastValue="0"/>
+        <field name="label_y" reuseLastValue="0"/>
+        <field name="man_made" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="never_show" reuseLastValue="0"/>
+        <field name="osm_id" reuseLastValue="0"/>
+        <field name="other_tags" reuseLastValue="0"/>
+        <field name="resident_a" reuseLastValue="0"/>
+        <field name="waterway" reuseLastValue="0"/>
+        <field name="z_order" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -17975,7 +15133,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="Point" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Point" styleCategories="AllStyleCategories">
+    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -18024,23 +15182,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18065,741 +15224,511 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="231,113,72,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="231,113,72,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="231,113,72,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="231,113,72,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="165,81,51,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="231,113,72,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="165,81,51,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="231,113,72,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="165,81,51,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{1c5aec7e-4c77-4262-a06c-203b26daec78}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="231,113,72,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="165,81,51,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="231,113,72,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="165,81,51,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="231,113,72,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="165,81,51,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
-          <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
-          <rule symbol="2" filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
-          <rule symbol="3" filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
-          <rule symbol="4" filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
-          <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
+          <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}" symbol="0"/>
+          <rule filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" symbol="1"/>
+          <rule filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" symbol="2"/>
+          <rule filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}" symbol="3"/>
+          <rule filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" symbol="4"/>
+          <rule filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="star" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.5" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="7" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="name" value="star" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.5" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="7" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="star" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.5" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="7" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '14', '7' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '14', '7' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="1" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+            <layer id="{74e7b734-0e1a-432e-bf3d-32d79041a365}" locked="0" enabled="1" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="0,32,80,255" name="color"/>
-                <Option type="QString" value="0" name="fixedAspectRatio"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="amenity/amenity_toilets.svg" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="0,32,80,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="amenity/amenity_toilets.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="7" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="7" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="0,32,80,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="amenity/amenity_toilets.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="" k="parameters"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="7" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="2" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+            <layer id="{38428a6a-34c4-41de-a5a9-70586b4b9787}" locked="0" enabled="1" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="0" name="fixedAspectRatio"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="../images/gym-bag.svg" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="../images/gym-bag.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="6" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="6" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="../images/gym-bag.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="" k="parameters"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="3" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+            <layer id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}" locked="0" enabled="1" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="125,139,143,255" name="color"/>
-                <Option type="QString" value="0" name="fixedAspectRatio"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="../images/road_closure.svg" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="../images/road_closure.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="6" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="6" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="125,139,143,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="../images/road_closure.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="" k="parameters"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '6' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '6' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="4" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="4" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+            <layer id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}" locked="0" enabled="1" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="0,12,254,255" name="color"/>
-                <Option type="QString" value="0" name="fixedAspectRatio"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="transport/transport_bus_stop.svg" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="255,255,255,255" name="outline_color"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="0,12,254,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="transport/transport_bus_stop.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="255,255,255,255" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="5" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="0,12,254,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="transport/transport_bus_stop.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="255,255,255,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="" k="parameters"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option type="QString" value="13" name="blend_mode"/>
-                    <Option type="QString" value="2.645" name="blur_level"/>
-                    <Option type="QString" value="MM" name="blur_unit"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                    <Option type="QString" value="0,0,0,255" name="color"/>
-                    <Option type="QString" value="2" name="draw_mode"/>
-                    <Option type="QString" value="0" name="enabled"/>
-                    <Option type="QString" value="135" name="offset_angle"/>
-                    <Option type="QString" value="2" name="offset_distance"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                    <Option type="QString" value="1" name="opacity"/>
+                    <Option name="blend_mode" value="13" type="QString"/>
+                    <Option name="blur_level" value="2.645" type="QString"/>
+                    <Option name="blur_unit" value="MM" type="QString"/>
+                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="offset_angle" value="135" type="QString"/>
+                    <Option name="offset_distance" value="2" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="offset_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="opacity" value="1" type="QString"/>
                   </Option>
-                  <prop v="13" k="blend_mode"/>
-                  <prop v="2.645" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="135" k="offset_angle"/>
-                  <prop v="2" k="offset_distance"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                  <prop v="1" k="opacity"/>
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="blend_mode"/>
-                    <Option type="QString" value="0.7935" name="blur_level"/>
-                    <Option type="QString" value="MM" name="blur_unit"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                    <Option type="QString" value="0,0,255,255" name="color1"/>
-                    <Option type="QString" value="0,255,0,255" name="color2"/>
-                    <Option type="QString" value="0" name="color_type"/>
-                    <Option type="QString" value="ccw" name="direction"/>
-                    <Option type="QString" value="0" name="discrete"/>
-                    <Option type="QString" value="2" name="draw_mode"/>
-                    <Option type="QString" value="1" name="enabled"/>
-                    <Option type="QString" value="0.5" name="opacity"/>
-                    <Option type="QString" value="gradient" name="rampType"/>
-                    <Option type="QString" value="255,255,255,255" name="single_color"/>
-                    <Option type="QString" value="rgb" name="spec"/>
-                    <Option type="QString" value="2" name="spread"/>
-                    <Option type="QString" value="MM" name="spread_unit"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                    <Option name="blend_mode" value="0" type="QString"/>
+                    <Option name="blur_level" value="0.7935" type="QString"/>
+                    <Option name="blur_unit" value="MM" type="QString"/>
+                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color1" value="0,0,255,255" type="QString"/>
+                    <Option name="color2" value="0,255,0,255" type="QString"/>
+                    <Option name="color_type" value="0" type="QString"/>
+                    <Option name="direction" value="ccw" type="QString"/>
+                    <Option name="discrete" value="0" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="1" type="QString"/>
+                    <Option name="opacity" value="0.5" type="QString"/>
+                    <Option name="rampType" value="gradient" type="QString"/>
+                    <Option name="single_color" value="255,255,255,255" type="QString"/>
+                    <Option name="spec" value="rgb" type="QString"/>
+                    <Option name="spread" value="2" type="QString"/>
+                    <Option name="spread_unit" value="MM" type="QString"/>
+                    <Option name="spread_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   </Option>
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="0.7935" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,255,255" k="color1"/>
-                  <prop v="0,255,0,255" k="color2"/>
-                  <prop v="0" k="color_type"/>
-                  <prop v="ccw" k="direction"/>
-                  <prop v="0" k="discrete"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="1" k="enabled"/>
-                  <prop v="0.5" k="opacity"/>
-                  <prop v="gradient" k="rampType"/>
-                  <prop v="255,255,255,255" k="single_color"/>
-                  <prop v="rgb" k="spec"/>
-                  <prop v="2" k="spread"/>
-                  <prop v="MM" k="spread_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="blend_mode"/>
-                    <Option type="QString" value="2" name="draw_mode"/>
-                    <Option type="QString" value="1" name="enabled"/>
-                    <Option type="QString" value="1" name="opacity"/>
+                    <Option name="blend_mode" value="0" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="1" type="QString"/>
+                    <Option name="opacity" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="1" k="enabled"/>
-                  <prop v="1" k="opacity"/>
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option type="QString" value="13" name="blend_mode"/>
-                    <Option type="QString" value="2.645" name="blur_level"/>
-                    <Option type="QString" value="MM" name="blur_unit"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                    <Option type="QString" value="0,0,0,255" name="color"/>
-                    <Option type="QString" value="2" name="draw_mode"/>
-                    <Option type="QString" value="0" name="enabled"/>
-                    <Option type="QString" value="135" name="offset_angle"/>
-                    <Option type="QString" value="2" name="offset_distance"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                    <Option type="QString" value="1" name="opacity"/>
+                    <Option name="blend_mode" value="13" type="QString"/>
+                    <Option name="blur_level" value="2.645" type="QString"/>
+                    <Option name="blur_unit" value="MM" type="QString"/>
+                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="offset_angle" value="135" type="QString"/>
+                    <Option name="offset_distance" value="2" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="offset_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="opacity" value="1" type="QString"/>
                   </Option>
-                  <prop v="13" k="blend_mode"/>
-                  <prop v="2.645" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="135" k="offset_angle"/>
-                  <prop v="2" k="offset_distance"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                  <prop v="1" k="opacity"/>
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="blend_mode"/>
-                    <Option type="QString" value="0.7935" name="blur_level"/>
-                    <Option type="QString" value="MM" name="blur_unit"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                    <Option type="QString" value="0,0,255,255" name="color1"/>
-                    <Option type="QString" value="0,255,0,255" name="color2"/>
-                    <Option type="QString" value="0" name="color_type"/>
-                    <Option type="QString" value="ccw" name="direction"/>
-                    <Option type="QString" value="0" name="discrete"/>
-                    <Option type="QString" value="2" name="draw_mode"/>
-                    <Option type="QString" value="0" name="enabled"/>
-                    <Option type="QString" value="0.5" name="opacity"/>
-                    <Option type="QString" value="gradient" name="rampType"/>
-                    <Option type="QString" value="255,255,255,255" name="single_color"/>
-                    <Option type="QString" value="rgb" name="spec"/>
-                    <Option type="QString" value="2" name="spread"/>
-                    <Option type="QString" value="MM" name="spread_unit"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                    <Option name="blend_mode" value="0" type="QString"/>
+                    <Option name="blur_level" value="0.7935" type="QString"/>
+                    <Option name="blur_unit" value="MM" type="QString"/>
+                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color1" value="0,0,255,255" type="QString"/>
+                    <Option name="color2" value="0,255,0,255" type="QString"/>
+                    <Option name="color_type" value="0" type="QString"/>
+                    <Option name="direction" value="ccw" type="QString"/>
+                    <Option name="discrete" value="0" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="opacity" value="0.5" type="QString"/>
+                    <Option name="rampType" value="gradient" type="QString"/>
+                    <Option name="single_color" value="255,255,255,255" type="QString"/>
+                    <Option name="spec" value="rgb" type="QString"/>
+                    <Option name="spread" value="2" type="QString"/>
+                    <Option name="spread_unit" value="MM" type="QString"/>
+                    <Option name="spread_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   </Option>
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="0.7935" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,255,255" k="color1"/>
-                  <prop v="0,255,0,255" k="color2"/>
-                  <prop v="0" k="color_type"/>
-                  <prop v="ccw" k="direction"/>
-                  <prop v="0" k="discrete"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="0.5" k="opacity"/>
-                  <prop v="gradient" k="rampType"/>
-                  <prop v="255,255,255,255" k="single_color"/>
-                  <prop v="rgb" k="spec"/>
-                  <prop v="2" k="spread"/>
-                  <prop v="MM" k="spread_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
                 </effect>
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="5" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="5" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+            <layer id="{810b6ab6-d667-41dd-991f-1013e4243a85}" locked="0" enabled="1" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="43,153,41,255" name="color"/>
-                <Option type="QString" value="0" name="fixedAspectRatio"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="transport/amenity=parking.svg" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="43,153,41,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="transport/amenity=parking.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="6" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="6" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="43,153,41,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="transport/amenity=parking.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="" k="parameters"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -18808,221 +15737,183 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="name" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="0" bufferSize="2" bufferColor="255,255,255,255" bufferOpacity="0.80000000000000004" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="1" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="0.69999999999999996" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="2" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="2" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="1">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferSize="2" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="2" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="0.69999999999999996" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="2" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="LabelDistance">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="if( @map_scale &lt; 7000, '5', '3' )" name="expression"/>
-                    <Option type="int" value="3" name="type"/>
+                <Option name="name" value="" type="QString"/>
+                <Option name="properties" type="Map">
+                  <Option name="LabelDistance" type="Map">
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="if( @map_scale &lt; 7000, '5', '3' )" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
-                  <Option type="Map" name="OffsetQuad">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="2" name="expression"/>
-                    <Option type="int" value="3" name="type"/>
+                  <Option name="OffsetQuad" type="Map">
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="2" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
-                  <Option type="Map" name="Size">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="if( @map_scale &lt; 7000, '14', '10' )" name="expression"/>
-                    <Option type="int" value="3" name="type"/>
+                  <Option name="Size" type="Map">
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="if( @map_scale &lt; 7000, '14', '10' )" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                 </Option>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-          <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MM" priority="10" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="2" geometryGeneratorEnabled="0" quadOffset="2" placement="0" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="3"/>
-          <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="10" upsidedownLabels="0" obstacleFactor="1.8" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="3" xOffset="2" priority="10" yOffset="3" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+          <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="10" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1.8" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelDistance">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="if( @map_scale &lt; 7000, '5', '3' )" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="LabelDistance" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="if( @map_scale &lt; 7000, '5', '3' )" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="OffsetQuad">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="2" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="OffsetQuad" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="2" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="if( @map_scale &lt; 7000, '14', '10' )" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="if( @map_scale &lt; 7000, '14', '10' )" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-              <Option type="int" value="0" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-              <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-              <Option type="double" value="0" name="minLength"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-              <Option type="QString" value="MM" name="minLengthUnit"/>
-              <Option type="double" value="0" name="offsetFromAnchor"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-              <Option type="double" value="0" name="offsetFromLabel"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="id" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" italic="1" style="0" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{96ec7de4-c56e-43b5-b272-81c659d6f103}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -19030,16 +15921,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -19081,35 +15972,41 @@ def my_form_open(dialog, layer, feature):
         <alias field="name" index="2" name=""/>
         <alias field="distance" index="3" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="name"/>
+        <policy policy="Duplicate" field="distance"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="distance" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="distance"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="distance" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="name"/>
-          <column hidden="0" type="field" width="-1" name="distance"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="name" width="-1" type="field" hidden="0"/>
+          <column name="distance" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19141,16 +16038,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="distance" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -19158,7 +16055,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="MultiPolygon" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" styleCategories="AllStyleCategories">
+    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -19198,19 +16095,20 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -19231,356 +16129,246 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="152,125,183,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="152,125,183,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="152,125,183,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{638d4661-4af7-4b67-a441-09cca39661c7}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="152,125,183,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="109,89,131,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="152,125,183,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="109,89,131,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="152,125,183,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="109,89,131,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="152,125,183,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="109,89,131,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="152,125,183,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="109,89,131,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="152,125,183,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="109,89,131,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="LinePatternFill" locked="0" enabled="1">
+            <layer id="{73145fbe-931c-4579-aa0e-58592a465db8}" locked="0" enabled="1" pass="0" class="LinePatternFill">
               <Option type="Map">
-                <Option type="QString" value="135" name="angle"/>
-                <Option type="QString" value="during_render" name="clip_mode"/>
-                <Option type="QString" value="211,134,33,255" name="color"/>
-                <Option type="QString" value="feature" name="coordinate_reference"/>
-                <Option type="QString" value="2" name="distance"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="distance_map_unit_scale"/>
-                <Option type="QString" value="MM" name="distance_unit"/>
-                <Option type="QString" value="0.26" name="line_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="line_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option name="angle" value="135" type="QString"/>
+                <Option name="clip_mode" value="during_render" type="QString"/>
+                <Option name="color" value="211,134,33,255" type="QString"/>
+                <Option name="coordinate_reference" value="feature" type="QString"/>
+                <Option name="distance" value="2" type="QString"/>
+                <Option name="distance_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="distance_unit" value="MM" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
               </Option>
-              <prop v="135" k="angle"/>
-              <prop v="during_render" k="clip_mode"/>
-              <prop v="211,134,33,255" k="color"/>
-              <prop v="feature" k="coordinate_reference"/>
-              <prop v="2" k="distance"/>
-              <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-              <prop v="MM" k="distance_unit"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="line" is_animated="0" name="@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@0@0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <layer id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}" locked="0" enabled="1" pass="0" class="SimpleLine">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="align_dash_pattern"/>
-                    <Option type="QString" value="square" name="capstyle"/>
-                    <Option type="QString" value="5;2" name="customdash"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="customdash_unit"/>
-                    <Option type="QString" value="0" name="dash_pattern_offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                    <Option type="QString" value="0" name="draw_inside_polygon"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="211,134,33,255" name="line_color"/>
-                    <Option type="QString" value="solid" name="line_style"/>
-                    <Option type="QString" value="0.3" name="line_width"/>
-                    <Option type="QString" value="MM" name="line_width_unit"/>
-                    <Option type="QString" value="0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0" name="ring_filter"/>
-                    <Option type="QString" value="0" name="trim_distance_end"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                    <Option type="QString" value="0" name="trim_distance_start"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                    <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                    <Option type="QString" value="0" name="use_custom_dash"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                    <Option name="align_dash_pattern" value="0" type="QString"/>
+                    <Option name="capstyle" value="square" type="QString"/>
+                    <Option name="customdash" value="5;2" type="QString"/>
+                    <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="customdash_unit" value="MM" type="QString"/>
+                    <Option name="dash_pattern_offset" value="0" type="QString"/>
+                    <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                    <Option name="draw_inside_polygon" value="0" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="line_color" value="211,134,33,255" type="QString"/>
+                    <Option name="line_style" value="solid" type="QString"/>
+                    <Option name="line_width" value="0.3" type="QString"/>
+                    <Option name="line_width_unit" value="MM" type="QString"/>
+                    <Option name="offset" value="0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="ring_filter" value="0" type="QString"/>
+                    <Option name="trim_distance_end" value="0" type="QString"/>
+                    <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                    <Option name="trim_distance_start" value="0" type="QString"/>
+                    <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                    <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                    <Option name="use_custom_dash" value="0" type="QString"/>
+                    <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   </Option>
-                  <prop v="0" k="align_dash_pattern"/>
-                  <prop v="square" k="capstyle"/>
-                  <prop v="5;2" k="customdash"/>
-                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                  <prop v="MM" k="customdash_unit"/>
-                  <prop v="0" k="dash_pattern_offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                  <prop v="MM" k="dash_pattern_offset_unit"/>
-                  <prop v="0" k="draw_inside_polygon"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="211,134,33,255" k="line_color"/>
-                  <prop v="solid" k="line_style"/>
-                  <prop v="0.3" k="line_width"/>
-                  <prop v="MM" k="line_width_unit"/>
-                  <prop v="0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0" k="ring_filter"/>
-                  <prop v="0" k="trim_distance_end"/>
-                  <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                  <prop v="MM" k="trim_distance_end_unit"/>
-                  <prop v="0" k="trim_distance_start"/>
-                  <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                  <prop v="MM" k="trim_distance_start_unit"/>
-                  <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                  <prop v="0" k="use_custom_dash"/>
-                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="211,134,33,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.46" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="no" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="211,134,33,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.46" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="no" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="211,134,33,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.46" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="no" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19591,93 +16379,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="id" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" italic="1" style="0" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{415aef82-46a2-4dec-86d6-89f9b40ee054}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -19685,16 +16446,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="1" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="1" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -19712,24 +16473,27 @@ def my_form_open(dialog, layer, feature):
       <aliases>
         <alias field="FID" index="0" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="FID"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="FID"/>
+        <default field="FID" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="FID" exp_strength="0"/>
+        <constraint unique_strength="0" field="FID" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="FID"/>
+        <constraint field="FID" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="431" name="type"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="type" width="431" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19761,12 +16525,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -19774,7 +16538,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -19823,23 +16587,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -19864,882 +16629,612 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="190,207,80,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="190,207,80,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="190,207,80,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{aa41f8f2-660a-40d2-ba74-664ae83521de}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="190,207,80,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="136,148,57,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="190,207,80,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,148,57,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="190,207,80,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="136,148,57,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="190,207,80,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="136,148,57,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="190,207,80,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,148,57,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="190,207,80,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="136,148,57,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open"/>
-          <rule symbol="1" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking"/>
-          <rule symbol="2" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed"/>
-          <rule symbol="3" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way"/>
-          <rule symbol="4" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures"/>
+          <rule filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" symbol="0" label="Road Open"/>
+          <rule filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" symbol="1" label="No Parking"/>
+          <rule filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" symbol="2" label="Lane Closed"/>
+          <rule filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" symbol="3" label="One-Way"/>
+          <rule filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" symbol="4" label="Road Closures"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,255,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.75" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,255,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="1" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="2" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="2" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="2" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@1@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{8668549c-374e-4077-bc7c-96a9bac646a8}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,255,0,255" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0.5" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="1" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,255,0,255" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0.5" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="1" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,255,0,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0.5" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="1" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="2" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="2;1;1;1" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,255,0,255" name="line_color"/>
-                <Option type="QString" value="dash dot dot" name="line_style"/>
-                <Option type="QString" value="0.75" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="1" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="2;1;1;1" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,255,0,255" type="QString"/>
+                <Option name="line_style" value="dash dot dot" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="2;1;1;1" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="dash dot dot" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="250" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="25" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="25" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="25" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@2@1" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@2@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{e7a97d22-eba0-4c48-9578-db859faf4112}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="0,255,0,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="35,35,35,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="3.5" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,255,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="35,35,35,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3.5" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="0,255,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3.5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="3" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="3" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{07696f80-e7db-403b-b380-82695a86ae34}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="3;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,255,0,255" name="line_color"/>
-                <Option type="QString" value="dash" name="line_style"/>
-                <Option type="QString" value="0.75" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="1" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="3;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,255,0,255" type="QString"/>
+                <Option name="line_style" value="dash" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="3;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="dash" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="250" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="25" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="25" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="25" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@3@1" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@3@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{e24fa060-35e4-4c51-b944-426558636610}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="0,255,0,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="35,35,35,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="3.5" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,255,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="35,35,35,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3.5" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="0,255,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3.5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="4" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="4" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="255,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.75" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="255,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20748,189 +17243,151 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Regular" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="times" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="9" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="times" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="4294967295" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-          <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MM" priority="5" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="2" offsetType="0" centroidWhole="0" allowDegraded="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-          <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="4294967295" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+          <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-              <Option type="int" value="0" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-              <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-              <Option type="double" value="0" name="minLength"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-              <Option type="QString" value="MM" name="minLengthUnit"/>
-              <Option type="double" value="0" name="offsetFromAnchor"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-              <Option type="double" value="0" name="offsetFromLabel"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="id" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" italic="1" style="0" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{27379576-e711-4788-850d-75df56ba927b}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20938,16 +17395,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -20989,35 +17446,41 @@ def my_form_open(dialog, layer, feature):
         <alias field="status" index="2" name=""/>
         <alias field="times" index="3" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="status"/>
+        <policy policy="Duplicate" field="times"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="status"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="status" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="times" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="status" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="times" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="status"/>
-        <constraint desc="" exp="" field="times"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="status" exp="" desc=""/>
+        <constraint field="times" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="202" name="type"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="status"/>
-          <column hidden="0" type="field" width="-1" name="times"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="type" width="202" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="status" width="-1" type="field" hidden="0"/>
+          <column name="times" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21049,16 +17512,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="status"/>
-        <field editable="1" name="times"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="status" editable="1"/>
+        <field name="times" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="status"/>
-        <field labelOnTop="0" name="times"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="status" labelOnTop="0"/>
+        <field name="times" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -21066,21 +17529,21 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="Point" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" refreshOnNotifyMessage="" geometry="Point" styleCategories="AllStyleCategories">
+    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
-        <xmin>18.37569038998762494</xmin>
+        <xmin>18.37531611534391729</xmin>
         <ymin>-33.95582126985814853</ymin>
         <xmax>18.42275999405387665</xmax>
-        <ymax>-33.89974290493045572</ymax>
+        <ymax>-33.89975916640027265</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37569038998762494</xmin>
+        <xmin>18.37531611534391729</xmin>
         <ymin>-33.95582126985814853</ymin>
         <xmax>18.42275999405387665</xmax>
-        <ymax>-33.89974290493045572</ymax>
+        <ymax>-33.89975916640027265</ymax>
       </wgs84extent>
-      <id>route_markers_21122a5c_9be9_458c_9d62_573685055e1c</id>
-      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)</datasource>
+      <id>route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1</id>
+      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(5,0)</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -21106,6 +17569,7 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -21139,1182 +17603,1002 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{93207e61-042d-4541-8790-df2a776e7483}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="225,89,137,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="225,89,137,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="225,89,137,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="225,89,137,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="161,64,98,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="225,89,137,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="161,64,98,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="225,89,137,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="161,64,98,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="225,89,137,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="161,64,98,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="225,89,137,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="161,64,98,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="225,89,137,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="161,64,98,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="rule-based">
         <rules key="{0a67d1c6-0289-43d0-8cea-e94d16054c5d}">
           <rule description="Active routes" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{c7589943-f7c2-4796-a405-6a8c9e18ff15}">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="255,255,255,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="1" shapeOffsetY="0" shapeSizeX="1">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="213,180,60,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="213,180,60,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="213,180,60,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="0,0,0,255" name="color"/>
-                        <Option type="QString" value="round" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="1" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="0,0,0,255" k="color"/>
-                      <prop v="round" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="1" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option 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" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option 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" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="3" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="quadrant" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="quadrant" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="field" value="rotation" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show by day" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1a82228c-f408-4c3d-bb8d-158713c47604}">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="255,255,255,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="1" shapeOffsetY="0" shapeSizeX="1">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="213,180,60,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="213,180,60,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="213,180,60,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="0,0,0,255" name="color"/>
-                        <Option type="QString" value="round" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="1" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="0,0,0,255" k="color"/>
-                      <prop v="round" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="1" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option 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" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option 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" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="3" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="quadrant" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="quadrant" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="field" value="rotation" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}">
-            <rule description="21KM" filter="&quot;Source&quot; = '21KM'" active="0" key="{69589abf-aba7-483e-bc24-1c579c8a7db2}">
+          <rule description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}" active="0">
+            <rule description="21KM" filter="&quot;Source&quot; = '21KM'" key="{69589abf-aba7-483e-bc24-1c579c8a7db2}" active="0">
               <settings calloutType="simple">
-                <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="255,255,255,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+                <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                  <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="210,32,39,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="1" shapeOffsetY="0" shapeSizeX="1">
-                    <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                  <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                  <background shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="210,32,39,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                    <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                         <Option type="Map">
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                          <Option type="QString" value="210,32,39,255" name="color"/>
-                          <Option type="QString" value="round" name="joinstyle"/>
-                          <Option type="QString" value="0,0" name="offset"/>
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                          <Option type="QString" value="MM" name="offset_unit"/>
-                          <Option type="QString" value="210,32,39,255" name="outline_color"/>
-                          <Option type="QString" value="solid" name="outline_style"/>
-                          <Option type="QString" value="1" name="outline_width"/>
-                          <Option type="QString" value="MM" name="outline_width_unit"/>
-                          <Option type="QString" value="solid" name="style"/>
+                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="color" value="210,32,39,255" type="QString"/>
+                          <Option name="joinstyle" value="round" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="210,32,39,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="1" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="style" value="solid" type="QString"/>
                         </Option>
-                        <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                        <prop v="210,32,39,255" k="color"/>
-                        <prop v="round" k="joinstyle"/>
-                        <prop v="0,0" k="offset"/>
-                        <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                        <prop v="MM" k="offset_unit"/>
-                        <prop v="210,32,39,255" k="outline_color"/>
-                        <prop v="solid" k="outline_style"/>
-                        <prop v="1" k="outline_width"/>
-                        <prop v="MM" k="outline_width_unit"/>
-                        <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" value="" name="name"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option type="QString" value="collection" name="type"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" value="true" name="active"/>
-                          <Option type="QString" value="quadrant" name="field"/>
-                          <Option type="int" value="2" name="type"/>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="field" value="quadrant" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="QString" value="rotation" name="field"/>
-                          <Option type="int" value="2" name="type"/>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="field" value="rotation" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-                <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="3" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2"/>
-                <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+                <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+                <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+                <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="quadrant" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="quadrant" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="rotation" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="field" value="rotation" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                    <Option type="int" value="0" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" value="" name="name"/>
+                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                    <Option name="blendMode" value="0" type="int"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
-                    <Option type="bool" value="false" name="drawToAllParts"/>
-                    <Option type="QString" value="0" name="enabled"/>
-                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                    <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                    <Option type="double" value="0" name="minLength"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                    <Option type="QString" value="MM" name="minLengthUnit"/>
-                    <Option type="double" value="0" name="offsetFromAnchor"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                    <Option type="double" value="0" name="offsetFromLabel"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                    <Option name="drawToAllParts" value="false" type="bool"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="10KM" filter="&quot;Source&quot; = '10KM'" active="0" key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}">
+            <rule description="10KM" filter="&quot;Source&quot; = '10KM'" key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}" active="0">
               <settings calloutType="simple">
-                <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="255,255,255,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+                <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                  <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="103,34,144,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="1" shapeOffsetY="0" shapeSizeX="1">
-                    <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                  <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                  <background shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="103,34,144,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                    <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                         <Option type="Map">
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                          <Option type="QString" value="103,34,144,255" name="color"/>
-                          <Option type="QString" value="round" name="joinstyle"/>
-                          <Option type="QString" value="0,0" name="offset"/>
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                          <Option type="QString" value="MM" name="offset_unit"/>
-                          <Option type="QString" value="103,34,144,255" name="outline_color"/>
-                          <Option type="QString" value="solid" name="outline_style"/>
-                          <Option type="QString" value="1" name="outline_width"/>
-                          <Option type="QString" value="MM" name="outline_width_unit"/>
-                          <Option type="QString" value="solid" name="style"/>
+                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="color" value="103,34,144,255" type="QString"/>
+                          <Option name="joinstyle" value="round" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="103,34,144,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="1" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="style" value="solid" type="QString"/>
                         </Option>
-                        <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                        <prop v="103,34,144,255" k="color"/>
-                        <prop v="round" k="joinstyle"/>
-                        <prop v="0,0" k="offset"/>
-                        <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                        <prop v="MM" k="offset_unit"/>
-                        <prop v="103,34,144,255" k="outline_color"/>
-                        <prop v="solid" k="outline_style"/>
-                        <prop v="1" k="outline_width"/>
-                        <prop v="MM" k="outline_width_unit"/>
-                        <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" value="" name="name"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option type="QString" value="collection" name="type"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" value="true" name="active"/>
-                          <Option type="QString" value="quadrant" name="field"/>
-                          <Option type="int" value="2" name="type"/>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="field" value="quadrant" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="QString" value="rotation" name="field"/>
-                          <Option type="int" value="2" name="type"/>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="field" value="rotation" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-                <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2"/>
-                <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+                <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+                <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+                <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="quadrant" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="quadrant" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="rotation" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="field" value="rotation" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                    <Option type="int" value="0" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" value="" name="name"/>
+                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                    <Option name="blendMode" value="0" type="int"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
-                    <Option type="bool" value="false" name="drawToAllParts"/>
-                    <Option type="QString" value="0" name="enabled"/>
-                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                    <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                    <Option type="double" value="0" name="minLength"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                    <Option type="QString" value="MM" name="minLengthUnit"/>
-                    <Option type="double" value="0" name="offsetFromAnchor"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                    <Option type="double" value="0" name="offsetFromLabel"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                    <Option name="drawToAllParts" value="false" type="bool"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="5KM" filter="&quot;Source&quot; = '5KM'" active="0" key="{693188a6-ae99-4fd2-859f-1606793dda66}">
+            <rule description="5KM" filter="&quot;Source&quot; = '5KM'" key="{693188a6-ae99-4fd2-859f-1606793dda66}" active="0">
               <settings calloutType="simple">
-                <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="255,255,255,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+                <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                  <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="1" shapeOffsetY="0" shapeSizeX="1">
-                    <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                  <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                  <background shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                    <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                         <Option type="Map">
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                          <Option type="QString" value="145,211,55,255" name="color"/>
-                          <Option type="QString" value="round" name="joinstyle"/>
-                          <Option type="QString" value="0,0" name="offset"/>
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                          <Option type="QString" value="MM" name="offset_unit"/>
-                          <Option type="QString" value="145,211,55,255" name="outline_color"/>
-                          <Option type="QString" value="solid" name="outline_style"/>
-                          <Option type="QString" value="1" name="outline_width"/>
-                          <Option type="QString" value="MM" name="outline_width_unit"/>
-                          <Option type="QString" value="solid" name="style"/>
+                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="color" value="145,211,55,255" type="QString"/>
+                          <Option name="joinstyle" value="round" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="145,211,55,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="1" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="style" value="solid" type="QString"/>
                         </Option>
-                        <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                        <prop v="145,211,55,255" k="color"/>
-                        <prop v="round" k="joinstyle"/>
-                        <prop v="0,0" k="offset"/>
-                        <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                        <prop v="MM" k="offset_unit"/>
-                        <prop v="145,211,55,255" k="outline_color"/>
-                        <prop v="solid" k="outline_style"/>
-                        <prop v="1" k="outline_width"/>
-                        <prop v="MM" k="outline_width_unit"/>
-                        <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" value="" name="name"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option type="QString" value="collection" name="type"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" value="true" name="active"/>
-                          <Option type="QString" value="quadrant" name="field"/>
-                          <Option type="int" value="2" name="type"/>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="field" value="quadrant" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="QString" value="rotation" name="field"/>
-                          <Option type="int" value="2" name="type"/>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="field" value="rotation" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-                <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2"/>
-                <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+                <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+                <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+                <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="quadrant" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="quadrant" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="rotation" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="field" value="rotation" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                    <Option type="int" value="0" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" value="" name="name"/>
+                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                    <Option name="blendMode" value="0" type="int"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
-                    <Option type="bool" value="false" name="drawToAllParts"/>
-                    <Option type="QString" value="0" name="enabled"/>
-                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                    <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                    <Option type="double" value="0" name="minLength"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                    <Option type="QString" value="MM" name="minLengthUnit"/>
-                    <Option type="double" value="0" name="offsetFromAnchor"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                    <Option type="double" value="0" name="offsetFromLabel"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                    <Option name="drawToAllParts" value="false" type="bool"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="Trail" filter="&quot;Source&quot; = 'Trail'" active="0" key="{ba58e108-c24a-410e-9584-a7819af049ef}">
+            <rule description="Trail" filter="&quot;Source&quot; = 'Trail'" key="{ba58e108-c24a-410e-9584-a7819af049ef}" active="0">
               <settings calloutType="simple">
-                <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="255,255,255,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+                <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                  <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="1" shapeOffsetY="0" shapeSizeX="1">
-                    <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                  <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                  <background shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                    <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                         <Option type="Map">
-                          <Option type="QString" value="0" name="angle"/>
-                          <Option type="QString" value="square" name="cap_style"/>
-                          <Option type="QString" value="133,182,111,255" name="color"/>
-                          <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                          <Option type="QString" value="bevel" name="joinstyle"/>
-                          <Option type="QString" value="circle" name="name"/>
-                          <Option type="QString" value="0,0" name="offset"/>
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                          <Option type="QString" value="MM" name="offset_unit"/>
-                          <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                          <Option type="QString" value="solid" name="outline_style"/>
-                          <Option type="QString" value="0" name="outline_width"/>
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                          <Option type="QString" value="MM" name="outline_width_unit"/>
-                          <Option type="QString" value="diameter" name="scale_method"/>
-                          <Option type="QString" value="2" name="size"/>
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                          <Option type="QString" value="MM" name="size_unit"/>
-                          <Option type="QString" value="1" name="vertical_anchor_point"/>
+                          <Option name="angle" value="0" type="QString"/>
+                          <Option name="cap_style" value="square" type="QString"/>
+                          <Option name="color" value="133,182,111,255" type="QString"/>
+                          <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                          <Option name="joinstyle" value="bevel" type="QString"/>
+                          <Option name="name" value="circle" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="0" type="QString"/>
+                          <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="scale_method" value="diameter" type="QString"/>
+                          <Option name="size" value="2" type="QString"/>
+                          <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="size_unit" value="MM" type="QString"/>
+                          <Option name="vertical_anchor_point" value="1" type="QString"/>
                         </Option>
-                        <prop v="0" k="angle"/>
-                        <prop v="square" k="cap_style"/>
-                        <prop v="133,182,111,255" k="color"/>
-                        <prop v="1" k="horizontal_anchor_point"/>
-                        <prop v="bevel" k="joinstyle"/>
-                        <prop v="circle" k="name"/>
-                        <prop v="0,0" k="offset"/>
-                        <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                        <prop v="MM" k="offset_unit"/>
-                        <prop v="35,35,35,255" k="outline_color"/>
-                        <prop v="solid" k="outline_style"/>
-                        <prop v="0" k="outline_width"/>
-                        <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                        <prop v="MM" k="outline_width_unit"/>
-                        <prop v="diameter" k="scale_method"/>
-                        <prop v="2" k="size"/>
-                        <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                        <prop v="MM" k="size_unit"/>
-                        <prop v="1" k="vertical_anchor_point"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" value="" name="name"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option type="QString" value="collection" name="type"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                    <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                         <Option type="Map">
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                          <Option type="QString" value="0,72,255,255" name="color"/>
-                          <Option type="QString" value="round" name="joinstyle"/>
-                          <Option type="QString" value="0,0" name="offset"/>
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                          <Option type="QString" value="MM" name="offset_unit"/>
-                          <Option type="QString" value="0,72,255,255" name="outline_color"/>
-                          <Option type="QString" value="solid" name="outline_style"/>
-                          <Option type="QString" value="1" name="outline_width"/>
-                          <Option type="QString" value="MM" name="outline_width_unit"/>
-                          <Option type="QString" value="solid" name="style"/>
+                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="color" value="0,72,255,255" type="QString"/>
+                          <Option name="joinstyle" value="round" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="0,72,255,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="1" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="style" value="solid" type="QString"/>
                         </Option>
-                        <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                        <prop v="0,72,255,255" k="color"/>
-                        <prop v="round" k="joinstyle"/>
-                        <prop v="0,0" k="offset"/>
-                        <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                        <prop v="MM" k="offset_unit"/>
-                        <prop v="0,72,255,255" k="outline_color"/>
-                        <prop v="solid" k="outline_style"/>
-                        <prop v="1" k="outline_width"/>
-                        <prop v="MM" k="outline_width_unit"/>
-                        <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" value="" name="name"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option type="QString" value="collection" name="type"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-                <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2"/>
-                <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+                <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+                <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+                <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="quadrant" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="quadrant" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="rotation" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="field" value="rotation" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                    <Option type="int" value="0" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" value="" name="name"/>
+                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                    <Option name="blendMode" value="0" type="int"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
-                    <Option type="bool" value="false" name="drawToAllParts"/>
-                    <Option type="QString" value="0" name="enabled"/>
-                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                    <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                    <Option type="double" value="0" name="minLength"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                    <Option type="QString" value="MM" name="minLengthUnit"/>
-                    <Option type="double" value="0" name="offsetFromAnchor"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                    <Option type="double" value="0" name="offsetFromLabel"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                    <Option name="drawToAllParts" value="false" type="bool"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
@@ -22324,95 +18608,68 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="no_action" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="100000" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{356245f8-3346-4eac-9a56-56f8cd3c59de}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22420,16 +18677,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="2" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -22440,8 +18697,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22450,8 +18707,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22460,8 +18717,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22470,8 +18727,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22480,8 +18737,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22490,8 +18747,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22500,8 +18757,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22510,8 +18767,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22534,8 +18791,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22544,8 +18801,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22554,8 +18811,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22564,8 +18821,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22595,79 +18852,96 @@ def my_form_open(dialog, layer, feature):
         <alias field="distance" index="13" name=""/>
         <alias field="quadrant" index="14" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="Name"/>
+        <policy policy="Duplicate" field="descriptio"/>
+        <policy policy="Duplicate" field="timestamp"/>
+        <policy policy="Duplicate" field="begin"/>
+        <policy policy="Duplicate" field="end"/>
+        <policy policy="Duplicate" field="Distance"/>
+        <policy policy="Duplicate" field="RouteLen"/>
+        <policy policy="Duplicate" field="Source"/>
+        <policy policy="Duplicate" field="Sort"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="length_km"/>
+        <policy policy="Duplicate" field="length_m"/>
+        <policy policy="Duplicate" field="org_fid"/>
+        <policy policy="Duplicate" field="distance"/>
+        <policy policy="Duplicate" field="quadrant"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="Sort"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" field="length_m"/>
-        <default applyOnUpdate="0" expression="" field="org_fid"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="Name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="descriptio" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="timestamp" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="begin" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="end" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Distance" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="RouteLen" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Source" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Sort" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="length_km" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="length_m" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="org_fid" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="distance" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="quadrant" exp_strength="0"/>
+        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Sort" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="org_fid" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="quadrant" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="Sort"/>
-        <constraint desc="" exp="" field="day"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="org_fid"/>
-        <constraint desc="" exp="" field="distance"/>
-        <constraint desc="" exp="" field="quadrant"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="Sort" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="org_fid" exp="" desc=""/>
+        <constraint field="distance" exp="" desc=""/>
+        <constraint field="quadrant" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="org_fid"/>
-          <column hidden="0" type="field" width="-1" name="distance"/>
-          <column hidden="0" type="field" width="-1" name="Name"/>
-          <column hidden="0" type="field" width="-1" name="Source"/>
-          <column hidden="0" type="field" width="-1" name="RouteLen"/>
-          <column hidden="0" type="field" width="-1" name="descriptio"/>
-          <column hidden="0" type="field" width="-1" name="timestamp"/>
-          <column hidden="0" type="field" width="-1" name="begin"/>
-          <column hidden="0" type="field" width="-1" name="end"/>
-          <column hidden="0" type="field" width="-1" name="Distance"/>
-          <column hidden="0" type="field" width="-1" name="length_km"/>
-          <column hidden="0" type="field" width="-1" name="Sort"/>
-          <column hidden="0" type="field" width="-1" name="quadrant"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
-          <column hidden="0" type="field" width="-1" name="length_m"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="org_fid" width="-1" type="field" hidden="0"/>
+          <column name="distance" width="-1" type="field" hidden="0"/>
+          <column name="Name" width="-1" type="field" hidden="0"/>
+          <column name="Source" width="-1" type="field" hidden="0"/>
+          <column name="RouteLen" width="-1" type="field" hidden="0"/>
+          <column name="descriptio" width="-1" type="field" hidden="0"/>
+          <column name="timestamp" width="-1" type="field" hidden="0"/>
+          <column name="begin" width="-1" type="field" hidden="0"/>
+          <column name="end" width="-1" type="field" hidden="0"/>
+          <column name="Distance" width="-1" type="field" hidden="0"/>
+          <column name="length_km" width="-1" type="field" hidden="0"/>
+          <column name="Sort" width="-1" type="field" hidden="0"/>
+          <column name="quadrant" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="length_m" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22699,62 +18973,62 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Sort"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Sort"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="quadrant"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Sort" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="quadrant" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="Distance"/>
-        <field reuseLastValue="0" name="Name"/>
-        <field reuseLastValue="0" name="RouteLen"/>
-        <field reuseLastValue="0" name="Sort"/>
-        <field reuseLastValue="0" name="Source"/>
-        <field reuseLastValue="0" name="begin"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="descriptio"/>
-        <field reuseLastValue="0" name="distance"/>
-        <field reuseLastValue="0" name="end"/>
-        <field reuseLastValue="0" name="length_km"/>
-        <field reuseLastValue="0" name="length_m"/>
-        <field reuseLastValue="0" name="org_fid"/>
-        <field reuseLastValue="0" name="quadrant"/>
-        <field reuseLastValue="0" name="timestamp"/>
+        <field name="Distance" reuseLastValue="0"/>
+        <field name="Name" reuseLastValue="0"/>
+        <field name="RouteLen" reuseLastValue="0"/>
+        <field name="Sort" reuseLastValue="0"/>
+        <field name="Source" reuseLastValue="0"/>
+        <field name="begin" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="descriptio" reuseLastValue="0"/>
+        <field name="distance" reuseLastValue="0"/>
+        <field name="end" reuseLastValue="0"/>
+        <field name="length_km" reuseLastValue="0"/>
+        <field name="length_m" reuseLastValue="0"/>
+        <field name="org_fid" reuseLastValue="0"/>
+        <field name="quadrant" reuseLastValue="0"/>
+        <field name="timestamp" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="MultiPolygon" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" styleCategories="AllStyleCategories">
+    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -22794,18 +19068,19 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
@@ -22827,241 +19102,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{5dca61e4-69c2-4b97-a344-09472092e8cb}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="229,182,54,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="229,182,54,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="229,182,54,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="229,182,54,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="164,130,39,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="229,182,54,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="164,130,39,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="229,182,54,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="164,130,39,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="229,182,54,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="164,130,39,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="229,182,54,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="164,130,39,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="229,182,54,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="164,130,39,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="114,155,111,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="114,155,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="114,155,111,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23072,18 +19279,18 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="&quot;id&quot;" name="dualview/previewExpressions"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="&quot;id&quot;" type="QString"/>
         </Option>
       </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=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -23117,31 +19324,36 @@ def my_form_open(dialog, layer, feature):
         <alias field="area" index="1" name=""/>
         <alias field="rotation" index="2" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="area"/>
+        <policy policy="Duplicate" field="rotation"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="area"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="area" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="rotation" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="area" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="rotation" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="area"/>
-        <constraint desc="" exp="" field="rotation"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="area" exp="" desc=""/>
+        <constraint field="rotation" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="area"/>
-          <column hidden="0" type="field" width="-1" name="rotation"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="area" width="-1" type="field" hidden="0"/>
+          <column name="rotation" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23164,7 +19376,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="Point" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Point" styleCategories="AllStyleCategories">
+    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -23213,23 +19425,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -23254,271 +19467,195 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{365af962-5b68-4f08-a049-7f2e6c9b8744}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="196,60,57,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="196,60,57,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="196,60,57,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="196,60,57,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="140,43,41,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="196,60,57,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="140,43,41,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="196,60,57,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="140,43,41,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="196,60,57,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="140,43,41,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="196,60,57,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="140,43,41,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="196,60,57,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="140,43,41,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances"/>
+          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" symbol="0" label="All distances" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="1" enabled="1">
+            <layer id="{929956be-fb51-4c17-886b-1ed43d282cde}" locked="1" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="circle" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,0" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="0.5" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,0" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="0.5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,0" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23530,97 +19667,70 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="StringList" name="dualview/previewExpressions">
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="StringList">
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23628,16 +19738,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -23669,8 +19779,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -23686,8 +19796,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -23696,8 +19806,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -23760,71 +19870,86 @@ def my_form_open(dialog, layer, feature):
         <alias field="first_runn" index="11" name=""/>
         <alias field="last_runne" index="12" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="Name"/>
+        <policy policy="Duplicate" field="descriptio"/>
+        <policy policy="Duplicate" field="timestamp"/>
+        <policy policy="Duplicate" field="begin"/>
+        <policy policy="Duplicate" field="end"/>
+        <policy policy="Duplicate" field="RouteLen"/>
+        <policy policy="Duplicate" field="Source"/>
+        <policy policy="Duplicate" field="length_m"/>
+        <policy policy="Duplicate" field="length_km"/>
+        <policy policy="Duplicate" field="org_fid"/>
+        <policy policy="Duplicate" field="distance"/>
+        <policy policy="Duplicate" field="first_runn"/>
+        <policy policy="Duplicate" field="last_runne"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="length_m"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" field="org_fid"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
-        <default applyOnUpdate="0" expression="" field="first_runn"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="Name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="descriptio" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="timestamp" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="begin" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="end" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="RouteLen" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Source" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="length_m" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="length_km" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="org_fid" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="distance" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="first_runn" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="last_runne" exp_strength="0"/>
+        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="org_fid" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="first_runn" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="last_runne" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="org_fid"/>
-        <constraint desc="" exp="" field="distance"/>
-        <constraint desc="" exp="" field="first_runn"/>
-        <constraint desc="" exp="" field="last_runne"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="org_fid" exp="" desc=""/>
+        <constraint field="distance" exp="" desc=""/>
+        <constraint field="first_runn" exp="" desc=""/>
+        <constraint field="last_runne" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;first_runn&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="179" name="begin"/>
-          <column hidden="0" type="field" width="-1" name="RouteLen"/>
-          <column hidden="0" type="field" width="-1" name="Source"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="Name"/>
-          <column hidden="0" type="field" width="-1" name="length_m"/>
-          <column hidden="0" type="field" width="-1" name="length_km"/>
-          <column hidden="0" type="field" width="-1" name="org_fid"/>
-          <column hidden="0" type="field" width="-1" name="first_runn"/>
-          <column hidden="0" type="field" width="-1" name="last_runne"/>
-          <column hidden="0" type="field" width="-1" name="descriptio"/>
-          <column hidden="0" type="field" width="-1" name="timestamp"/>
-          <column hidden="0" type="field" width="-1" name="end"/>
-          <column hidden="0" type="field" width="-1" name="distance"/>
+          <column name="begin" width="179" type="field" hidden="0"/>
+          <column name="RouteLen" width="-1" type="field" hidden="0"/>
+          <column name="Source" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="Name" width="-1" type="field" hidden="0"/>
+          <column name="length_m" width="-1" type="field" hidden="0"/>
+          <column name="length_km" width="-1" type="field" hidden="0"/>
+          <column name="org_fid" width="-1" type="field" hidden="0"/>
+          <column name="first_runn" width="-1" type="field" hidden="0"/>
+          <column name="last_runne" width="-1" type="field" hidden="0"/>
+          <column name="descriptio" width="-1" type="field" hidden="0"/>
+          <column name="timestamp" width="-1" type="field" hidden="0"/>
+          <column name="end" width="-1" type="field" hidden="0"/>
+          <column name="distance" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23856,58 +19981,58 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="display"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="distance_1"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="first_run"/>
-        <field editable="1" name="first_runn"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="first_runner_s"/>
-        <field editable="0" name="last_run"/>
-        <field editable="1" name="last_runn"/>
-        <field editable="1" name="last_runne"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="last_runner_s"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="display" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="distance_1" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="first_run" editable="1"/>
+        <field name="first_runn" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="first_runner_s" editable="1"/>
+        <field name="last_run" editable="0"/>
+        <field name="last_runn" editable="1"/>
+        <field name="last_runne" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="last_runner_s" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="display"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="distance_1"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="first_run"/>
-        <field labelOnTop="0" name="first_runn"/>
-        <field labelOnTop="0" name="first_runner"/>
-        <field labelOnTop="0" name="first_runner_s"/>
-        <field labelOnTop="0" name="last_run"/>
-        <field labelOnTop="0" name="last_runn"/>
-        <field labelOnTop="0" name="last_runne"/>
-        <field labelOnTop="0" name="last_runner"/>
-        <field labelOnTop="0" name="last_runner_s"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="display" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="distance_1" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="first_run" labelOnTop="0"/>
+        <field name="first_runn" labelOnTop="0"/>
+        <field name="first_runner" labelOnTop="0"/>
+        <field name="first_runner_s" labelOnTop="0"/>
+        <field name="last_run" labelOnTop="0"/>
+        <field name="last_runn" labelOnTop="0"/>
+        <field name="last_runne" labelOnTop="0"/>
+        <field name="last_runner" labelOnTop="0"/>
+        <field name="last_runner_s" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -23915,7 +20040,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -23955,19 +20080,20 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -23988,476 +20114,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{963b9e9e-c03d-476c-a792-effe8028add1}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="190,178,151,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="190,178,151,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="190,178,151,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{7362ff98-e908-498b-82c9-17b74285e0f4}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="190,178,151,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="136,127,108,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="190,178,151,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,127,108,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="190,178,151,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="136,127,108,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{20af25c5-139a-4a43-b257-4147f560bd1e}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="190,178,151,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="136,127,108,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="190,178,151,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,127,108,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="190,178,151,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="136,127,108,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car"/>
-          <rule symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking"/>
+          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" label="Car"/>
+          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" label="Walking"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="123,211,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="1" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="123,211,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="123,211,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="1" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="flat" name="capstyle"/>
-                <Option type="QString" value="4;1;1;1" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="103,34,144,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="1.25" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="1" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="4;1;1;1" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1.25" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="flat" k="capstyle"/>
-              <prop v="4;1;1;1" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1.25" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{c75a7de7-f06a-429a-b940-1629f9306aaa}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@1@1" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{c86ba77b-3947-4686-9d93-5c997e6dde40}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="103,34,144,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="5" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="5" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@1@1@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{61856921-c649-4f9a-86f1-1032eeec1eca}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="103,34,144,255" name="color"/>
-                        <Option type="QString" value="miter" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="no" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="miter" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -24470,93 +20446,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="id" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" italic="1" style="0" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24564,16 +20513,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -24599,27 +20548,31 @@ def my_form_open(dialog, layer, feature):
         <alias field="id" index="0" name=""/>
         <alias field="type" index="1" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="type"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24651,12 +20604,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -24664,7 +20617,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="Point" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Point" styleCategories="AllStyleCategories">
+    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -24704,19 +20657,20 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -24737,386 +20691,291 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{360268ec-74bf-49a5-9cdc-3d49f645479f}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="145,82,45,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="145,82,45,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="145,82,45,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="145,82,45,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="104,59,32,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="145,82,45,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="104,59,32,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="145,82,45,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="104,59,32,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="145,82,45,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="104,59,32,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="145,82,45,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="104,59,32,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="145,82,45,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="104,59,32,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="label" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="15" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="label" fontSize="15" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-          <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MM" priority="5" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="0" offsetType="0" centroidWhole="0" allowDegraded="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-          <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+          <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-              <Option type="int" value="0" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-              <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-              <Option type="double" value="0" name="minLength"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-              <Option type="QString" value="MM" name="minLengthUnit"/>
-              <Option type="double" value="0" name="offsetFromAnchor"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-              <Option type="double" value="0" name="offsetFromLabel"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" italic="1" style="0" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25124,16 +20983,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -25159,27 +21018,31 @@ def my_form_open(dialog, layer, feature):
         <alias field="id" index="0" name=""/>
         <alias field="label" index="1" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="label"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="label"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="label" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="label" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="label"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="label" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="label"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="label" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25211,12 +21074,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -25224,7 +21087,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="MultiPolygon" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" styleCategories="AllStyleCategories">
+    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -25273,23 +21136,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -25314,354 +21178,267 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{21311e5c-9c25-4470-8640-7b6d873bbd81}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="125,139,143,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="125,139,143,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="125,139,143,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{653976c3-86ea-4acf-889f-aa8a836d6d67}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="125,139,143,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="89,99,102,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="89,99,102,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="125,139,143,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="89,99,102,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="125,139,143,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="89,99,102,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="89,99,102,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="125,139,143,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="89,99,102,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
           <rule description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
             <settings calloutType="simple">
-              <text-style namedStyle="Bold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="31,120,180,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="label" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" fontWordSpacing="0" textOrientation="horizontal" fontSize="8" fontWeight="75" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="label" fontSize="8" textOrientation="horizontal" fontKerning="1" textColor="31,120,180,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" isExpression="0" namedStyle="Bold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="0" bufferSize="0.75" bufferColor="255,255,255,255" bufferOpacity="0.40000000000000002" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0.29999999999999999" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,204" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.59999999999999998" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0.5" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0.5" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.75" shapeOffsetY="-0.14999999999999999" shapeSizeX="0.75">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferSize="0.75" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,204" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="-0.14999999999999999" shapeType="0" shapeRadiiX="0.5" shapeBorderColor="31,120,206,255" shapeBorderWidth="0.75" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.29999999999999999" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeOpacity="0.59999999999999998" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0.5" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="196,60,57,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="196,60,57,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="196,60,57,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,204" name="color"/>
-                        <Option type="QString" value="round" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="31,120,206,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.75" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,204" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="31,120,206,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.75" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,204" k="color"/>
-                      <prop v="round" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="31,120,206,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.75" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="1" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="5" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="PolygonGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="1" geometryGeneratorEnabled="0" quadOffset="1" placement="0" offsetType="0" centroidWhole="1" allowDegraded="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="5" upsidedownLabels="0" obstacleFactor="0.76000000000000001" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="6" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="1" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="1" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="0" quadOffset="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PolygonGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="5" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="6" mergeLines="0" obstacleFactor="0.76000000000000001" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -25670,99 +21447,72 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <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 name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25770,22 +21520,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="2" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </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" value="0" name="allowedGapsBuffer"/>
-            <Option type="bool" value="false" name="allowedGapsEnabled"/>
-            <Option type="QString" value="" name="allowedGapsLayer"/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -25796,8 +21546,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -25806,8 +21556,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -25816,8 +21566,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -25844,39 +21594,46 @@ def my_form_open(dialog, layer, feature):
         <alias field="races" index="3" name=""/>
         <alias field="day" index="4" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="table_set"/>
+        <policy policy="Duplicate" field="label"/>
+        <policy policy="Duplicate" field="races"/>
+        <policy policy="Duplicate" field="day"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="table_set"/>
-        <default applyOnUpdate="0" expression="" field="label"/>
-        <default applyOnUpdate="0" expression="" field="races"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="table_set" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="label" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="races" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="table_set" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="races" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="table_set"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="races"/>
-        <constraint desc="" exp="" field="day"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="table_set" exp="" desc=""/>
+        <constraint field="label" exp="" desc=""/>
+        <constraint field="races" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="table_set"/>
-          <column hidden="0" type="field" width="-1" name="label"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
-          <column hidden="0" type="field" width="130" name="races"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="table_set" width="-1" type="field" hidden="0"/>
+          <column name="label" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="races" width="130" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25908,25 +21665,25 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="day" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="table_set"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="table_set" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="label"/>
-        <field reuseLastValue="0" name="races"/>
-        <field reuseLastValue="0" name="table_set"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="label" reuseLastValue="0"/>
+        <field name="races" reuseLastValue="0"/>
+        <field name="table_set" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
@@ -25960,7 +21717,7 @@ def my_form_open(dialog, layer, feature):
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
     <layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
     <layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
-    <layer id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+    <layer id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -26129,7 +21886,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/Marshals</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Routes</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -26154,6 +21911,7 @@ def my_form_open(dialog, layer, feature):
       <CandidatesPoint type="int">16</CandidatesPoint>
       <CandidatesPolygon type="int">30</CandidatesPolygon>
       <CandidatesPolygonPerCM type="double">2.5</CandidatesPolygonPerCM>
+      <DrawLabelMetrics type="bool">false</DrawLabelMetrics>
       <DrawOutlineLabels type="bool">true</DrawOutlineLabels>
       <DrawRectOnly type="bool">false</DrawRectOnly>
       <DrawUnplaced type="bool">false</DrawUnplaced>
@@ -26291,363 +22049,356 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option type="QString" value="" name="name"/>
+      <Option name="name" value="" type="QString"/>
       <Option name="properties"/>
-      <Option type="QString" value="collection" name="type"/>
+      <Option name="type" value="collection" type="QString"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
-    <visibility-preset has-expanded-info="1" name="Access Routes">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
+    <visibility-preset name="Access Routes" has-expanded-info="1">
+      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default" visible="1"/>
+      <layer visible="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" style="default"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default" visible="1"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
+    <visibility-preset name="Ask Me" has-expanded-info="1">
+      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default" visible="1"/>
+      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" style="default"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer visible="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" style="default"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Ask Me"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Cones">
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="1"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
+    <visibility-preset name="Cones" has-expanded-info="1" has-checked-group-info="1">
+      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
+      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Fencing and Cones"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Fencing">
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="1"/>
+      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <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 visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <checked-group-nodes>
+        <checked-group-node id="Map"/>
+        <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/Markers"/>
+        <checked-group-node id="Fencing and Cones"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Fencing" has-expanded-info="1" has-checked-group-info="1">
+      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <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 visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <checked-group-nodes>
+        <checked-group-node id="Map"/>
+        <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/Markers"/>
+        <checked-group-node id="Fencing and Cones"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <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-expanded-info="1" has-checked-group-info="1">
+      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <checked-group-nodes>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <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-expanded-info="1" has-checked-group-info="1">
+      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <checked-group-nodes>
+        <checked-group-node id="Map"/>
+        <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/Markers"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Marshal plan" has-expanded-info="1" has-checked-group-info="1">
+      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <checked-group-nodes>
+        <checked-group-node id="Map"/>
+        <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/Markers"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Routes" has-expanded-info="1" has-checked-group-info="1">
+      <layer visible="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer visible="1" id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1"/>
+      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+      <layer visible="0" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
+      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes/Markers"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Start/Finish" has-expanded-info="1">
+      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
+      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Fencing and Cones"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal map - inset">
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="0"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
+      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="0"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-        <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal map - main">
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
-      <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 expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="0"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal plan">
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="0"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Routes">
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="0"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="0"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Routes"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="1"/>
+      <layer visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default" visible="1"/>
+      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" expanded="1" style="default"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -26669,110 +22420,91 @@ def my_form_open(dialog, layer, feature):
       <role></role>
     </contact>
     <links/>
+    <dates>
+      <date value="2000-01-01T00:00:00" type="Created"/>
+    </dates>
     <author>Timothy Allen</author>
     <creation>2000-01-01T00:00:00</creation>
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout worldFileMap="" printResolution="120" units="mm" name="Marshals">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Marshals" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,210,mm" blendMode="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26780,15 +22512,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" hidePageIfEmpty="0" visibility="1" zValue="6" id="" hideBackgroundIfEmpty="0" position="158.226,6.0007,mm" frame="false" referencePoint="0" size="132.391,187.018,mm" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" blendMode="0" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" groupUuid="" opacity="1" type="65647" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" positionLock="true" sectionHeight="187.018" excludeFromExports="0" sectionWidth="132.391" outlineWidthM="0.3,mm" sectionY="0" sectionX="0" positionOnPage="158.226,6.0007,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" sectionHeight="184.8" type="65647" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" positionOnPage="158.226,6.0007,mm" position="158.226,6.0007,mm" outlineWidthM="0.3,mm" opacity="1" sectionY="0" frame="false" groupUuid="" excludeFromExports="0" hideBackgroundIfEmpty="0" size="132.391,187.018,mm" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" sectionX="0" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" itemRotation="0" hidePageIfEmpty="0" id="" visibility="1" positionLock="true" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" sectionWidth="132.391" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26796,15 +22528,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem columnSpace="2" wrapChar="" fontColor="#000000" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" equalColumnWidth="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" wmsLegendWidth="50" referencePoint="0" outlineWidthM="0.1,mm" id="" lineSpacing="1" symbolAlignment="1" itemRotation="0" minSymbolSize="0" maxSymbolSize="0" symbolHeight="4" zValue="5" type="65642" position="128.508,3.98741,mm" opacity="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" visibility="1" background="true" resizeToContents="1" rasterBorderColor="0,0,0,255" size="19.9422,32,mm" excludeFromExports="0" rasterBorderWidth="0" frame="true" titleAlignment="1" blendMode="0" positionOnPage="128.508,3.98741,mm" legendFilterByAtlas="0" frameJoinStyle="bevel" groupUuid="" symbolWidth="7" boxSpace="2" positionLock="true" splitLayer="0" title="" columnCount="1" wmsLegendHeight="25" rasterBorder="1">
-        <FrameColor red="128" green="128" blue="128" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="5" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="bevel" itemRotation="0" position="128.508,3.98741,mm" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" legendFilterByAtlas="0" outlineWidthM="0.1,mm" positionOnPage="128.508,3.98741,mm" minSymbolSize="0" frame="true" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" groupUuid="" size="19.9422,32,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="7" positionLock="true">
+        <FrameColor blue="128" green="128" red="128" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26812,263 +22544,429 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" bold="0" italic="0" style="Regular" strikethrough="0" underline="0"/>
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="group" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.8805579999999997" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="1" indent="0" name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="1">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.1750019999999992" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" indent="0" name="symbol" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" marginLeft="2" indent="0" name="symbolLabel" alignment="1">
-            <styleFont description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="3.8222239999999998" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="8" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="all_routes" source="./all_routes.shp|layername=all_routes" patch_size="0,0">
+            <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes"/>
-                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
-                  <Option type="int" value="0" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <custom-order enabled="0">
-            <item>all_routes_5833accf_77da_42ef_a24a_197208cd2190</item>
-          </custom-order>
+          <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" visibility="1" zValue="3" mapRotation="0" followPresetName="Marshal map - inset" id="Inset map" position="98.7828,149.027,mm" isTemporal="0" frame="true" referencePoint="0" size="56.5192,54.5647,mm" keepLayerSet="false" blendMode="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.2,mm" labelMargin="0,mm" positionOnPage="98.7828,149.027,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="true" type="65639" positionOnPage="98.7828,149.027,mm" position="98.7828,149.027,mm" outlineWidthM="0.2,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="56.5192,54.5647,mm" mapRotation="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" itemRotation="0" id="Inset map" isTemporal="0" followPresetName="Marshal map - inset" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94555865223922808" xmin="18.37465029319304222" xmax="18.37894504102223436" ymax="-33.94141242425128269"/>
+        <Extent ymax="-33.91207845085496331" xmin="18.42079363057069585" ymin="-33.91622252962687867" xmax="18.42508615219792389"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="0" bottomAnnotationDirection="0" intervalY="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="0" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" intervalX="0" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="0" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="0" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" name="Grid 1" frameAnnotationDistance="1" unit="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0,0,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -27076,45 +22974,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview inverted="0" blendMode="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" centered="1" name="Overview 1" show="1" position="3">
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <ComposerMapOverview uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" name="Overview 1" position="3" centered="1" inverted="0" blendMode="0" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="0,65,170,127" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,102" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,65,170,127" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,102" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,65,170,127" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,102" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27122,9 +23009,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -27132,230 +23019,173 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" visibility="1" zValue="2" mapRotation="0" followPresetName="Marshal map - main" id="Main map" position="3.53,6.0007,mm" isTemporal="0" frame="false" referencePoint="0" size="142,187.018,mm" keepLayerSet="false" blendMode="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="3.53,6.0007,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="false" type="65639" positionOnPage="3.53,6.0007,mm" position="3.53,6.0007,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="142,187.018,mm" mapRotation="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" itemRotation="0" id="Main map" isTemporal="0" followPresetName="Marshal map - main" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94416225303095302" xmin="18.37628384731003806" xmax="18.37731148690523852" ymax="-33.94280882345955774"/>
+        <Extent ymax="-33.91347412623339608" xmin="18.42242633792752926" ymin="-33.9148268542484459" xmax="18.42345344484109049"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="0" bottomAnnotationDirection="0" intervalY="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="0" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" intervalX="0" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="0" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="0" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" name="Grid 1" frameAnnotationDistance="1" unit="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0,0,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{7158b503-47c7-43d8-b863-66e9308bf8c9}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -27363,28 +23193,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../GunRun2022_500.png" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" anchorPoint="0" visibility="1" zValue="1" pictureHeight="25.2491" id="" svgBorderColor="0,0,0,255" position="246.665,178.41,mm" pictureWidth="47.1065" mode="1" frame="false" referencePoint="0" size="47.1065,27.6,mm" resizeMode="0" blendMode="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="246.665,178.41,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="1" background="false" mode="1" type="65640" file="../GunRun2022_500.png" positionOnPage="246.665,178.41,mm" position="246.665,178.41,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="27.4317" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="0" frame="false" groupUuid="" excludeFromExports="0" size="47.1065,27.6,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" northOffset="0" blendMode="0" pictureHeight="27.6">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27392,14 +23222,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame contentMode="1" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" resizeMode="0" type="65648" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;/tr>') %]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" evaluateExpressions="true" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" stylesheetEnabled="true" maxBreakDistance="10" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" url="" useSmartBreaks="true">
+      <LayoutMultiFrame uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" url="" type="65648" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;/tr>') %]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" maxBreakDistance="10" resizeMode="0" evaluateExpressions="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" contentMode="1" stylesheetEnabled="true">
         <childFrame uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27409,134 +23239,112 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="jpg" name="atlasRasterFormat"/>
-          <Option type="int" value="0" name="forceVector"/>
-          <Option type="bool" value="true" name="imageAntialias"/>
-          <Option type="int" value="0" name="imageCropMarginBottom"/>
-          <Option type="int" value="0" name="imageCropMarginLeft"/>
-          <Option type="int" value="0" name="imageCropMarginRight"/>
-          <Option type="int" value="0" name="imageCropMarginTop"/>
-          <Option type="QString" value="0" name="imageCropMarginUnit"/>
-          <Option type="bool" value="false" name="imageCropToContents"/>
-          <Option type="int" value="1" name="pdfAppendGeoreference"/>
-          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
-          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="" name="pdfExportThemes"/>
-          <Option type="int" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" name="pdfLayerOrder"/>
-          <Option type="int" value="0" name="pdfLosslessImages"/>
-          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
-          <Option type="int" value="1" name="pdfSimplify"/>
-          <Option type="int" value="0" name="pdfTextFormat"/>
-          <Option type="QString" value="false" name="rasterize"/>
-          <Option type="QString" value="3.53" name="resizeToContentsBottomMargin"/>
-          <Option type="QString" value="3.53" name="resizeToContentsLeftMargin"/>
-          <Option type="QString" value="3.53" name="resizeToContentsRightMargin"/>
-          <Option type="QString" value="3.53" name="resizeToContentsTopMargin"/>
-          <Option type="bool" value="false" name="singleFile"/>
+          <Option name="atlasRasterFormat" value="jpg" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="bool"/>
+          <Option name="imageCropMarginBottom" value="0" type="int"/>
+          <Option name="imageCropMarginLeft" value="0" type="int"/>
+          <Option name="imageCropMarginRight" value="0" type="int"/>
+          <Option name="imageCropMarginTop" value="0" type="int"/>
+          <Option name="imageCropMarginUnit" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="bool"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="rasterize" value="false" type="QString"/>
+          <Option name="resizeToContentsBottomMargin" value="3.53" type="QString"/>
+          <Option name="resizeToContentsLeftMargin" value="3.53" type="QString"/>
+          <Option name="resizeToContentsRightMargin" value="3.53" type="QString"/>
+          <Option name="resizeToContentsTopMargin" value="3.53" type="QString"/>
+          <Option name="singleFile" value="false" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" sortFeatures="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortKey="&quot;id&quot;" filterFeatures="0" coverageLayerName="marshal_positions" hideCoverage="0" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" pageNameExpression="&quot;position&quot;" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas sortKey="&quot;id&quot;" filterFeatures="0" pageNameExpression="&quot;position&quot;" coverageLayerName="marshal_positions" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayerProvider="ogr" sortAscending="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="1" hideCoverage="0" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortFeatures="1"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="300" units="mm" name="Start &amp; Finish Backgrounds">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Start &amp; Finish Backgrounds" printResolution="300" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,210,mm" blendMode="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{0b05c78e-869d-453c-b1fe-77568dc401f2}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27544,21 +23352,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="arrows/NorthArrow_11.svg" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" anchorPoint="0" visibility="1" zValue="4" pictureHeight="7.97477" id="" svgBorderColor="0,0,0,255" position="286.027,2,mm" pictureWidth="6.31767" mode="0" frame="false" referencePoint="0" size="9.45865,11,mm" resizeMode="0" blendMode="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="330" excludeFromExports="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="286.027,2,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="0" type="65640" file="arrows/NorthArrow_11.svg" positionOnPage="286.027,2,mm" position="286.027,2,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="6.31767" svgFillColor="255,255,255,255" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" anchorPoint="0" frame="false" groupUuid="" excludeFromExports="0" size="9.45865,11,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="330" id="" visibility="1" positionLock="true" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" northOffset="0" blendMode="0" pictureHeight="7.97477">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27566,647 +23374,476 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="270" background="false" frameJoinStyle="miter" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" visibility="1" valign="64" zValue="3" marginX="1" labelText="[%upper( &quot;area&quot; )%]" id="" position="285.027,205.886,mm" frame="false" referencePoint="0" size="142.543,10.3185,mm" blendMode="0" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="285.027,205.886,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65641" labelText="[%upper( &quot;area&quot; )%]" positionOnPage="285.027,205.886,mm" position="285.027,205.886,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="142.543,10.3185,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" itemRotation="270" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem maxBarWidth="150" minBarWidth="50" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" referencePoint="0" outlineWidthM="0.3,mm" id="" labelBarSpace="3" itemRotation="0" lineJoinStyle="miter" unitType="meters" segmentSizeMode="1" zValue="2" boxContentSpace="1" type="65646" numSubdivisions="1" segmentMillimeters="26.3519" position="7,189.669,mm" opacity="1" numUnitsPerSegment="100" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" visibility="1" background="false" numMapUnitsPerScaleBarUnit="1" numSegments="4" height="3" labelHorizontalPlacement="0" subdivisionsHeight="1.5" size="145.54,16.2165,mm" excludeFromExports="0" numSegmentsLeft="2" frame="false" labelVerticalPlacement="0" outlineWidth="0.3" unitLabel="m" blendMode="0" positionOnPage="7,189.669,mm" frameJoinStyle="miter" groupUuid="" positionLock="true" style="Single Box" lineCapStyle="square" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" alignment="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem minBarWidth="50" opacity="1" lineJoinStyle="miter" numSegmentsLeft="2" unitLabel="m" labelVerticalPlacement="0" segmentMillimeters="26.3519" numUnitsPerSegment="100" zValue="2" numSegments="4" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" segmentSizeMode="1" type="65646" subdivisionsHeight="1.5" height="3" numSubdivisions="1" lineCapStyle="square" outlineWidth="0.3" visibility="1" frameJoinStyle="miter" itemRotation="0" numMapUnitsPerScaleBarUnit="1" position="7,189.669,mm" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" outlineWidthM="0.3,mm" positionOnPage="7,189.669,mm" frame="false" referencePoint="0" style="Single Box" unitType="meters" maxBarWidth="150" boxContentSpace="1" id="" background="false" excludeFromExports="0" labelHorizontalPlacement="0" alignment="0" groupUuid="" size="145.54,16.2165,mm" blendMode="0" labelBarSpace="3" positionLock="true">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor red="0" green="0" blue="0" alpha="255"/>
+        <strokeColor blue="0" green="0" red="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="QChar" value="" name="decimal_separator"/>
-            <Option type="int" value="6" name="decimals"/>
-            <Option type="int" value="0" name="rounding_type"/>
-            <Option type="bool" value="false" name="show_plus"/>
-            <Option type="bool" value="true" name="show_thousand_separator"/>
-            <Option type="bool" value="false" name="show_trailing_zeros"/>
-            <Option type="QChar" value="" name="thousand_separator"/>
+            <Option name="decimal_separator" type="invalid"/>
+            <Option name="decimals" value="6" type="int"/>
+            <Option name="rounding_type" value="0" type="int"/>
+            <Option name="show_plus" value="false" type="bool"/>
+            <Option name="show_thousand_separator" value="true" type="bool"/>
+            <Option name="show_trailing_zeros" value="false" type="bool"/>
+            <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor red="0" green="0" blue="0" alpha="255"/>
-        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
+        <fillColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
         <lineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{40c19cdc-b5d8-4c29-b495-91831de94e96}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.3" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.3" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.3" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.3" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.3" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.3" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{89036785-f311-478b-b997-5a2119fbdd2c}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.3" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.3" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.3" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{987cde69-791e-42ba-9c64-bbe76719b954}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" visibility="1" zValue="1" mapRotation="330" followPresetName="Start/Finish" id="" position="7,5.5,mm" isTemporal="0" frame="false" referencePoint="0" size="278.027,180.318,mm" keepLayerSet="false" blendMode="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="7,5.5,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="false" type="65639" positionOnPage="7,5.5,mm" position="7,5.5,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="278.027,180.318,mm" mapRotation="330" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" itemRotation="0" id="" isTemporal="0" followPresetName="Start/Finish" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="rotation" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="rotation" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="id" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="id" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="angle" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="angle" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90494830469008747" xmin="18.40843143571575169" xmax="18.41790915398017958" ymax="-33.89880140828828559"/>
+        <Extent ymax="-33.89880140828828559" xmin="18.40843143571575169" ymin="-33.90494830469008747" xmax="18.41790915398017958"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="3" bottomAnnotationDirection="0" intervalY="5" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="3" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalX="5" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="3" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="4" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="3" name="Grid 1" frameAnnotationDistance="1" unit="1" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="3" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="1" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="3" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="3" bottomAnnotationPosition="1" annotationFormat="4" intervalX="5" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="3" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="5" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="195,195,195,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="195,195,195,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="195,195,195,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -28223,69 +23860,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28293,139 +23919,117 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="QString" value="0" name="forceVector"/>
-          <Option type="QString" value="true" name="imageAntialias"/>
-          <Option type="QString" value="0" name="imageCropMarginBottom"/>
-          <Option type="QString" value="0" name="imageCropMarginLeft"/>
-          <Option type="QString" value="0" name="imageCropMarginRight"/>
-          <Option type="QString" value="0" name="imageCropMarginTop"/>
-          <Option type="QString" value="false" name="imageCropToContents"/>
-          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="0" name="pdfTextFormat"/>
-          <Option type="QString" value="true" name="singleFile"/>
-          <Option type="QString" value="0" name="svgCropMarginBottom"/>
-          <Option type="QString" value="0" name="svgCropMarginLeft"/>
-          <Option type="QString" value="0" name="svgCropMarginRight"/>
-          <Option type="QString" value="0" name="svgCropMarginTop"/>
-          <Option type="QString" value="true" name="svgCropToContents"/>
-          <Option type="QString" value="0" name="svgDisableRasterTiles"/>
-          <Option type="QString" value="false" name="svgGroupLayers"/>
-          <Option type="QString" value="1" name="svgIncludeMetadata"/>
-          <Option type="QString" value="0" name="svgTextFormat"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="true" type="QString"/>
+          <Option name="svgCropMarginBottom" value="0" type="QString"/>
+          <Option name="svgCropMarginLeft" value="0" type="QString"/>
+          <Option name="svgCropMarginRight" value="0" type="QString"/>
+          <Option name="svgCropMarginTop" value="0" type="QString"/>
+          <Option name="svgCropToContents" value="true" type="QString"/>
+          <Option name="svgDisableRasterTiles" value="0" type="QString"/>
+          <Option name="svgGroupLayers" value="false" type="QString"/>
+          <Option name="svgIncludeMetadata" value="1" type="QString"/>
+          <Option name="svgTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortFeatures="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortKey="area" filterFeatures="0" coverageLayerName="start_finish_area" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;area&quot;" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas sortKey="area" filterFeatures="0" pageNameExpression="&quot;area&quot;" coverageLayerName="start_finish_area" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayerProvider="ogr" sortAscending="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="300" units="mm" name="Fencing">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Fencing" printResolution="300" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,210,mm" blendMode="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{acff6c17-7d68-4552-8826-25f0be803e5b}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28433,15 +24037,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" wrapChar="" fontColor="#000000" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" equalColumnWidth="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" wmsLegendWidth="50" referencePoint="0" outlineWidthM="0.3,mm" id="" lineSpacing="1" symbolAlignment="1" itemRotation="0" minSymbolSize="0" maxSymbolSize="0" symbolHeight="4" zValue="11" type="65642" position="256.808,5.21277,mm" opacity="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" visibility="1" background="true" resizeToContents="0" rasterBorderColor="0,0,0,255" size="38.1563,67.2879,mm" excludeFromExports="0" rasterBorderWidth="0" frame="true" titleAlignment="1" blendMode="0" positionOnPage="256.808,5.21277,mm" legendFilterByAtlas="0" frameJoinStyle="miter" groupUuid="" symbolWidth="7" boxSpace="2" positionLock="true" splitLayer="0" title="" columnCount="1" wmsLegendHeight="25" rasterBorder="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="11" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="256.808,5.21277,mm" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" frame="true" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" groupUuid="" size="38.1563,67.2879,mm" symbolAlignment="1" blendMode="0" resizeToContents="0" symbolWidth="7" positionLock="true">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28449,53 +24053,278 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" bold="1" italic="0" style="Bold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="3" indent="0" name="group" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="group" indent="0" marginTop="3">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="3" indent="0" name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="3">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" marginLeft="2" indent="0" name="symbolLabel" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0" italic="0" style="Regular" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Fencing and Cones">
+          <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="fencing" source="./fencing.shp|layername=fencing" patch_size="0,0">
+            <layer-tree-layer name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_exp="" patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
-                  <Option type="QString" value="" name="legend/expressionFilter"/>
-                  <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
-                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
+                  <Option name="legend/expressionFilter" value="" type="QString"/>
+                  <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="all_routes" source="./all_routes.shp|layername=all_routes" patch_size="0,0">
+            <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
-                  <Option type="int" value="0" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -28503,459 +24332,393 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" visibility="1" valign="32" zValue="10" marginX="0" labelText="FENCING: [% &quot;name&quot; %]" id="" position="6.76779,191.188,mm" frame="false" referencePoint="0" size="148.46,6.45211,mm" blendMode="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="6.76779,191.188,mm" halign="1" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="10" background="false" type="65641" labelText="FENCING: [% &quot;name&quot; %]" positionOnPage="6.76779,191.188,mm" position="6.76779,191.188,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="148.46,6.45211,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" visibility="1" valign="64" zValue="9" marginX="0" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" id="" position="182.723,191.188,mm" frame="false" referencePoint="0" size="56.3557,6.45237,mm" blendMode="0" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="1" outlineWidthM="0.3,mm" positionOnPage="182.723,191.188,mm" halign="2" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="9" background="false" type="65641" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" positionOnPage="182.723,191.188,mm" position="182.723,191.188,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="56.3557,6.45237,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" valign="64" blendMode="0" htmlState="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" visibility="1" valign="32" zValue="8" marginX="0" labelText="REVISION 5.0" id="" position="209.146,198.083,mm" frame="false" referencePoint="0" size="26.8205,6.82826,mm" blendMode="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="209.146,198.083,mm" halign="2" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="REVISION 3.0" positionOnPage="209.146,198.083,mm" position="209.146,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="26.8205,6.82826,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" visibility="1" valign="32" zValue="7" marginX="1" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" id="" position="62.6706,198.083,mm" frame="false" referencePoint="0" size="51.1638,7.07327,mm" blendMode="0" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="62.6706,198.083,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="false" type="65641" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" positionOnPage="62.6706,198.083,mm" position="62.6706,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.1638,7.07327,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" visibility="1" valign="32" zValue="6" marginX="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" id="" position="116.805,198.083,mm" frame="false" referencePoint="0" size="64.7594,7.10512,mm" blendMode="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="116.805,198.083,mm" halign="1" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" positionOnPage="116.805,198.083,mm" position="116.805,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="64.7594,7.10512,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" visibility="1" valign="32" zValue="5" marginX="0" labelText="Page [% @atlas_featurenumber %]" id="" position="6.76779,198.083,mm" frame="false" referencePoint="0" size="52.7903,7.07327,mm" blendMode="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="6.76779,198.083,mm" halign="1" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="Page [% @atlas_featurenumber %]" positionOnPage="6.76779,198.083,mm" position="6.76779,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="52.7903,7.07327,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../GunRun2022_250.png" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" anchorPoint="8" visibility="1" zValue="4" pictureHeight="26.4325" id="" svgBorderColor="0,0,0,255" position="243.098,175.353,mm" pictureWidth="49.3143" mode="1" frame="false" referencePoint="0" size="49.3143,29.8354,mm" resizeMode="0" blendMode="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="243.098,175.353,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="1" type="65640" file="../GunRun2022_250.png" positionOnPage="243.098,175.353,mm" position="243.098,175.353,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="29.6535" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="8" frame="false" groupUuid="" excludeFromExports="0" size="49.3143,29.8354,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" northOffset="0" blendMode="0" pictureHeight="29.8354">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28963,505 +24726,380 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" visibility="1" zValue="3" id="" position="6.91779,197.79,mm" frame="false" referencePoint="0" size="232.01,0.14328,mm" cornerRadiusMeasure="0,mm" blendMode="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" groupUuid="" opacity="1" shapeType="1" type="65643" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="6.91779,197.79,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65643" positionOnPage="6.91779,197.79,mm" position="6.91779,197.79,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="232.01,0.14328,mm" cornerRadiusMeasure="0,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="0,0,0,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="solid" name="outline_style"/>
-              <Option type="QString" value="0.3" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem maxBarWidth="100" minBarWidth="25" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" referencePoint="0" outlineWidthM="0.3,mm" id="" labelBarSpace="1" itemRotation="0" lineJoinStyle="round" unitType="meters" segmentSizeMode="1" zValue="2" boxContentSpace="0.2" type="65646" numSubdivisions="1" segmentMillimeters="33.2496" position="6.76779,2.8482,mm" opacity="1" numUnitsPerSegment="20" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" visibility="1" background="false" numMapUnitsPerScaleBarUnit="1" numSegments="2" height="2" labelHorizontalPlacement="0" subdivisionsHeight="1.5" size="109.51,15.8378,mm" excludeFromExports="0" numSegmentsLeft="2" frame="false" labelVerticalPlacement="0" outlineWidth="0.2" unitLabel="m" blendMode="0" positionOnPage="6.76779,2.8482,mm" frameJoinStyle="miter" groupUuid="" positionLock="true" style="Double Box" lineCapStyle="square" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" alignment="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem minBarWidth="25" opacity="1" lineJoinStyle="round" numSegmentsLeft="2" unitLabel="m" labelVerticalPlacement="0" segmentMillimeters="33.2496" numUnitsPerSegment="20" zValue="2" numSegments="2" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" segmentSizeMode="1" type="65646" subdivisionsHeight="1.5" height="2" numSubdivisions="1" lineCapStyle="square" outlineWidth="0.2" visibility="1" frameJoinStyle="miter" itemRotation="0" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" outlineWidthM="0.3,mm" positionOnPage="6.76779,2.8482,mm" frame="false" referencePoint="0" style="Double Box" unitType="meters" maxBarWidth="100" boxContentSpace="0.2" id="" background="false" excludeFromExports="0" labelHorizontalPlacement="0" alignment="0" groupUuid="" size="109.51,15.8378,mm" blendMode="0" labelBarSpace="1" positionLock="true">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor red="0" green="0" blue="0" alpha="255"/>
+        <strokeColor blue="0" green="0" red="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="QChar" value="" name="decimal_separator"/>
-            <Option type="int" value="6" name="decimals"/>
-            <Option type="int" value="0" name="rounding_type"/>
-            <Option type="bool" value="false" name="show_plus"/>
-            <Option type="bool" value="true" name="show_thousand_separator"/>
-            <Option type="bool" value="false" name="show_trailing_zeros"/>
-            <Option type="QChar" value="" name="thousand_separator"/>
+            <Option name="decimal_separator" type="invalid"/>
+            <Option name="decimals" value="6" type="int"/>
+            <Option name="rounding_type" value="0" type="int"/>
+            <Option name="show_plus" value="false" type="bool"/>
+            <Option name="show_thousand_separator" value="true" type="bool"/>
+            <Option name="show_trailing_zeros" value="false" type="bool"/>
+            <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor red="0" green="0" blue="0" alpha="255"/>
-        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
+        <fillColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
         <lineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.2" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.2" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.2" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.2" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{1f3874ac-6c08-4c55-861c-d829891d3b01}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.2" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.2" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{ae895973-56d3-4fc1-86c6-c98493abf339}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{c0c92035-0ffd-446d-b579-16536dd36b75}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" zValue="1" mapRotation="0" followPresetName="Fencing" id="" position="6.76779,9.35102,mm" isTemporal="0" frame="false" referencePoint="0" size="283.418,180.92,mm" keepLayerSet="false" blendMode="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" groupUuid="" opacity="0.9" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="6.76779,9.35102,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="false" type="65639" positionOnPage="6.76779,9.35102,mm" position="6.76779,9.35102,mm" outlineWidthM="0.3,mm" opacity="0.9" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="283.418,180.92,mm" mapRotation="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" itemRotation="0" id="" isTemporal="0" followPresetName="Fencing" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="Map" name="transformer">
-                    <Option type="Map" name="d">
-                      <Option type="double" value="1" name="exponent"/>
-                      <Option type="double" value="360" name="maxOutput"/>
-                      <Option type="double" value="0" name="maxValue"/>
-                      <Option type="double" value="0" name="minOutput"/>
-                      <Option type="double" value="0" name="minValue"/>
-                      <Option type="double" value="0" name="nullOutput"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="transformer" type="Map">
+                    <Option name="d" type="Map">
+                      <Option name="exponent" value="1" type="double"/>
+                      <Option name="maxOutput" value="360" type="double"/>
+                      <Option name="maxValue" value="0" type="double"/>
+                      <Option name="minOutput" value="0" type="double"/>
+                      <Option name="minValue" value="0" type="double"/>
+                      <Option name="nullOutput" value="0" type="double"/>
                     </Option>
-                    <Option type="int" value="0" name="t"/>
+                    <Option name="t" value="0" type="int"/>
                   </Option>
-                  <Option type="int" value="3" name="type"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="angle" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="angle" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90817940102682115" xmin="18.40368928312333452" xmax="18.40522072458854552" ymax="-33.90720180625844904"/>
+        <Extent ymax="-33.90720180625849167" xmin="18.40368928312333452" ymin="-33.90817940102677852" xmax="18.40522072458854552"/>
         <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>
@@ -29476,138 +25114,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="3" bottomAnnotationDirection="0" intervalY="5" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="3" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalX="5" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="3" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="4" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="3" name="Grid 1" frameAnnotationDistance="1" unit="1" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="3" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="1" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="3" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="3" bottomAnnotationPosition="1" annotationFormat="4" intervalX="5" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="3" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="5" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{e73cb565-3046-4259-89ee-05f5d6c61953}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="195,195,195,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="195,195,195,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="195,195,195,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -29624,69 +25216,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29694,303 +25275,259 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="int" value="0" name="forceVector"/>
-          <Option type="QString" value="true" name="imageAntialias"/>
-          <Option type="QString" value="0" name="imageCropMarginBottom"/>
-          <Option type="QString" value="0" name="imageCropMarginLeft"/>
-          <Option type="QString" value="0" name="imageCropMarginRight"/>
-          <Option type="QString" value="0" name="imageCropMarginTop"/>
-          <Option type="QString" value="false" name="imageCropToContents"/>
-          <Option type="int" value="1" name="pdfAppendGeoreference"/>
-          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
-          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="0" name="pdfExportGeoPdfFeatures"/>
-          <Option type="QString" value="" name="pdfExportThemes"/>
-          <Option type="int" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" name="pdfLayerOrder"/>
-          <Option type="int" value="0" name="pdfLosslessImages"/>
-          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
-          <Option type="int" value="1" name="pdfSimplify"/>
-          <Option type="int" value="0" name="pdfTextFormat"/>
-          <Option type="QString" value="true" name="rasterize"/>
-          <Option type="bool" value="true" name="singleFile"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportGeoPdfFeatures" value="0" type="QString"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="rasterize" value="true" type="QString"/>
+          <Option name="singleFile" value="true" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" sortFeatures="1" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" sortKey="&quot;group&quot;" filterFeatures="0" coverageLayerName="fence_and_cone_groups" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;" coverageLayerProvider="virtual" enabled="1"/>
+      <Atlas sortKey="&quot;group&quot;" filterFeatures="0" pageNameExpression="&quot;name&quot;" coverageLayerName="fence_and_cone_groups" 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" sortAscending="1" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
     </Layout>
-    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" printResolution="144" units="mm" name="Ask Me">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="9" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Ask Me" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="9" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{20578607-b7b1-4298-b229-e8f94e47157a}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,210,mm" blendMode="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide units="mm" orientation="2" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" visibility="1" valign="64" zValue="8" marginX="1" labelText="Directions to Start of Race" id="" position="4.43449,186.634,mm" frame="false" referencePoint="0" size="83.9998,10.4638,mm" blendMode="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" groupUuid="" opacity="1" type="65641" positionLock="false" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="4.43449,186.634,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="Directions to Start of Race" positionOnPage="4.43449,186.634,mm" position="4.43449,186.634,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="83.9998,10.4638,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" itemRotation="0" id="" halign="1" visibility="1" positionLock="false" marginY="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="14" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" visibility="1" valign="32" zValue="7" marginX="1" labelText="Gun Run" id="" position="4.43449,197.498,mm" frame="false" referencePoint="0" size="48.2923,9.511,mm" blendMode="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" groupUuid="" opacity="1" type="65641" positionLock="false" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="4.43449,197.498,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="false" type="65641" labelText="Gun Run" positionOnPage="4.43449,197.498,mm" position="4.43449,197.498,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="48.2923,9.511,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" itemRotation="0" id="" halign="1" visibility="1" positionLock="false" marginY="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem columnSpace="0" wrapChar="" fontColor="#000000" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" equalColumnWidth="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" wmsLegendWidth="50" referencePoint="0" outlineWidthM="0.3,mm" id="" lineSpacing="2" symbolAlignment="1" itemRotation="0" minSymbolSize="0" maxSymbolSize="0" symbolHeight="5" zValue="6" type="65642" position="10.096,10.8563,mm" opacity="1" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" visibility="1" background="true" resizeToContents="1" legendFilterByMap="1" rasterBorderColor="0,0,0,255" size="59.0766,76,mm" excludeFromExports="0" rasterBorderWidth="0" frame="true" titleAlignment="1" blendMode="0" positionOnPage="10.096,10.8563,mm" legendFilterByAtlas="0" frameJoinStyle="round" groupUuid="" symbolWidth="9" boxSpace="2" positionLock="false" splitLayer="0" title="" columnCount="1" wmsLegendHeight="25" rasterBorder="1">
-        <FrameColor red="139" green="139" blue="139" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="6" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" type="65642" legendFilterByMap="1" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="round" itemRotation="0" position="10.096,10.8563,mm" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="10.096,10.8563,mm" minSymbolSize="0" frame="true" symbolHeight="5" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="0" columnSpace="0" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" groupUuid="" size="59.0766,76,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="9" positionLock="false">
+        <FrameColor blue="139" green="139" red="139" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29998,52 +25535,277 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="7.6444479999999997" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="16" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="group" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="subgroup" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2.5" marginLeft="3" indent="0" name="symbolLabel" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" bold="0" italic="0" style="Regular" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbolLabel" indent="0" marginTop="2.5" marginLeft="3">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Ask Me">
+          <layer-tree-group name="Ask Me" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option type="Map">
-                <Option type="QString" value="hidden" name="legend/title-style"/>
+                <Option name="legend/title-style" value="hidden" type="QString"/>
               </Option>
             </customproperties>
-            <layer-tree-layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="poi_labels" source="./poi_labels.shp|layername=poi_labels" patch_size="0,0">
+            <layer-tree-layer name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" legend_exp="" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" value="Start/Finish" name="legend/label-0"/>
-                  <Option type="QString" value="Toilets" name="legend/label-1"/>
-                  <Option type="QString" value="Tog Bag Drop-off" name="legend/label-2"/>
-                  <Option type="QString" value="Road Closed to Cars" name="legend/label-3"/>
-                  <Option type="QString" value="MyCiti Drop-off" name="legend/label-4"/>
-                  <Option type="QString" value="Parking" name="legend/label-5"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option name="legend/label-0" value="Start/Finish" type="QString"/>
+                  <Option name="legend/label-1" value="Toilets" type="QString"/>
+                  <Option name="legend/label-2" value="Tog Bag Drop-off" type="QString"/>
+                  <Option name="legend/label-3" value="Road Closed to Cars" type="QString"/>
+                  <Option name="legend/label-4" value="MyCiti Drop-off" type="QString"/>
+                  <Option name="legend/label-5" value="Parking" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start" patch_size="0,0">
+            <layer-tree-layer name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" legend_exp="" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" value="To 21KM Start (06:30)" name="legend/label-0"/>
-                  <Option type="QString" value="To 10KM Start (07:30)" name="legend/label-1"/>
-                  <Option type="QString" value="To 5KM Start (08:30)" name="legend/label-2"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option name="legend/label-0" value="To 21KM Start (06:30)" type="QString"/>
+                  <Option name="legend/label-1" value="To 10KM Start (07:30)" type="QString"/>
+                  <Option name="legend/label-2" value="To 5KM Start (08:30)" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30051,167 +25813,145 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" visibility="1" valign="32" zValue="5" marginX="1" labelText="REVISION 1.0" id="" position="221.862,190.027,mm" frame="false" referencePoint="0" size="27.7839,6.871,mm" blendMode="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" groupUuid="" opacity="1" type="65641" positionLock="false" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="221.862,190.027,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="REVISION 1.0" positionOnPage="221.862,190.027,mm" position="221.862,190.027,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="27.7839,6.871,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" itemRotation="0" id="" halign="2" visibility="1" positionLock="false" marginY="1" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" visibility="1" valign="64" zValue="4" marginX="1" labelText="Sunday, 20 October 2019" id="" position="197.975,197.498,mm" frame="false" referencePoint="0" size="51.6706,6.60801,mm" blendMode="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" groupUuid="" opacity="1" type="65641" positionLock="false" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="197.975,197.498,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="4" background="false" type="65641" labelText="Sunday, 20 October 2019" positionOnPage="197.975,197.498,mm" position="197.975,197.498,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.6706,6.60801,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" itemRotation="0" id="" halign="2" visibility="1" positionLock="false" marginY="1" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../Gun_Run_Logo.png" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" anchorPoint="4" visibility="1" zValue="3" pictureHeight="24.3824" id="" svgBorderColor="0,0,0,255" position="249.646,179.724,mm" pictureWidth="24.2337" mode="1" frame="false" referencePoint="0" size="42.9838,24.3824,mm" resizeMode="0" blendMode="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="false" pictureRotation="0" excludeFromExports="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="249.646,179.724,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="3" background="false" mode="1" type="65640" file="../Gun_Run_Logo.png" positionOnPage="249.646,179.724,mm" position="249.646,179.724,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="24.2337" svgFillColor="255,255,255,255" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" anchorPoint="4" frame="false" groupUuid="" excludeFromExports="0" size="42.9838,24.3824,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="false" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" northOffset="0" blendMode="0" pictureHeight="24.3824">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30219,96 +25959,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" visibility="1" zValue="2" id="" position="4.58449,197.248,mm" frame="false" referencePoint="0" size="244.912,0.1,mm" cornerRadiusMeasure="0,mm" blendMode="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" groupUuid="" opacity="1" shapeType="1" type="65643" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="4.58449,197.248,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="false" type="65643" positionOnPage="4.58449,197.248,mm" position="4.58449,197.248,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="244.912,0.1,mm" cornerRadiusMeasure="0,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{25dc84af-8724-465b-a42c-c6c013132998}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="0,0,0,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="solid" name="outline_style"/>
-              <Option type="QString" value="0.3" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" zValue="1" mapRotation="0" followPresetName="Ask Me" id="" position="4.43449,6.411,mm" isTemporal="0" frame="false" referencePoint="0" size="288.007,183.616,mm" keepLayerSet="false" blendMode="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" groupUuid="" opacity="1" type="65639" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="4.43449,6.411,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="4.43449,6.411,mm" position="4.43449,6.411,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="288.007,183.616,mm" mapRotation="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" itemRotation="0" id="" isTemporal="0" followPresetName="Ask Me" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="false" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90994364588821952" xmin="18.39762336729721071" xmax="18.41789384089274151" ymax="-33.8970204297764468"/>
+        <Extent ymax="-33.8970204297764468" xmin="18.39762336729721071" ymin="-33.90994364588821952" xmax="18.41789384089274151"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -30323,206 +26052,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="0" bottomAnnotationDirection="0" intervalY="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="0" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalX="0" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="0" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="0" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" name="Grid 1" frameAnnotationDistance="1" unit="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0,0,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30530,373 +26202,318 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="QString" value="0" name="forceVector"/>
-          <Option type="QString" value="true" name="imageAntialias"/>
-          <Option type="QString" value="0" name="imageCropMarginBottom"/>
-          <Option type="QString" value="0" name="imageCropMarginLeft"/>
-          <Option type="QString" value="0" name="imageCropMarginRight"/>
-          <Option type="QString" value="0" name="imageCropMarginTop"/>
-          <Option type="QString" value="false" name="imageCropToContents"/>
-          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="0" name="pdfTextFormat"/>
-          <Option type="QString" value="true" name="singleFile"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas sortFeatures="0" coverageLayer="" filterFeatures="0" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression="" enabled="0"/>
+      <Atlas filterFeatures="0" pageNameExpression="" coverageLayer="" enabled="0" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="144" units="mm" name="Routes">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Routes" printResolution="144" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,210,mm" blendMode="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide units="mm" orientation="2" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" visibility="1" valign="32" zValue="13" marginX="0" labelText="REVISION 5.0" id="" position="200.171,199.082,mm" frame="false" referencePoint="0" size="61.5373,6.8714,mm" blendMode="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="200.171,199.082,mm" halign="2" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="13" background="false" type="65641" labelText="REVISION 1.0" positionOnPage="200.171,199.082,mm" position="200.171,199.082,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="61.5373,6.8714,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" visibility="1" valign="64" zValue="12" marginX="0" labelText="Gun Run 2022: [%&quot;Source&quot;%]" id="" position="9.7863,192.073,mm" frame="false" referencePoint="0" size="61.5373,6.60801,mm" blendMode="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="9.7863,192.073,mm" halign="1" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="12" background="false" type="65641" labelText="Gun Run 2023: [%&quot;Source&quot;%]" positionOnPage="9.7863,192.073,mm" position="9.7863,192.073,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="61.5373,6.60801,mm" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" visibility="1" valign="32" zValue="11" marginX="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" id="" position="9.7863,199.082,mm" frame="false" referencePoint="0" size="61.5373,6.60801,mm" blendMode="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="9.7863,199.082,mm" halign="1" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="11" background="false" type="65641" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" positionOnPage="9.7863,199.082,mm" position="9.7863,199.082,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="61.5373,6.60801,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../GunRun2022_250.png" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" anchorPoint="4" visibility="1" zValue="10" pictureHeight="15.9472" id="" svgBorderColor="0,0,0,255" position="262.196,188.218,mm" pictureWidth="29.7523" mode="1" frame="false" referencePoint="0" size="29.7523,17.4718,mm" resizeMode="0" blendMode="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="0" excludeFromExports="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="262.196,188.218,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="10" background="false" mode="1" type="65640" file="../GunRun2023_250.png" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="29.7523" svgFillColor="255,255,255,255" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" anchorPoint="4" frame="false" groupUuid="" excludeFromExports="0" size="29.7523,17.4718,mm" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" northOffset="0" blendMode="0" pictureHeight="16.8993">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30904,532 +26521,464 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" visibility="1" zValue="9" id="" position="9.57644,198.832,mm" frame="false" referencePoint="0" size="251.982,0.1,mm" cornerRadiusMeasure="0,mm" blendMode="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" groupUuid="" opacity="1" shapeType="1" type="65643" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="9.57644,198.832,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="9" background="false" type="65643" positionOnPage="9.57644,198.832,mm" position="9.57644,198.832,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="251.982,0.1,mm" cornerRadiusMeasure="0,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{04656074-3faa-4640-ae80-a44a8cb036f7}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="0,0,0,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="solid" name="outline_style"/>
-              <Option type="QString" value="0.3" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" visibility="1" zValue="8" mapRotation="0" followPresetName="Routes" id="Trail Finish" position="9.57644,5.42566,mm" isTemporal="0" frame="true" referencePoint="0" size="107.861,186.385,mm" keepLayerSet="false" blendMode="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="9.57644,5.42566,mm" drawCanvasItems="true">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="true" type="65639" positionOnPage="9.57644,5.42566,mm" position="9.57644,5.42566,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="107.861,186.385,mm" mapRotation="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" itemRotation="0" id="Trail Finish" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.93243205975926458" xmin="18.39314911415855391" xmax="18.41187375074135701" ymax="-33.90007566747966905"/>
+        <Extent ymax="-33.90007566747966905" xmin="18.39314911415855391" ymin="-33.93243205975926458" xmax="18.41187375074135701"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="1" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" visibility="1" zValue="7" mapRotation="0" followPresetName="Routes" id="Trail Start" position="112.643,4.09761,mm" isTemporal="0" frame="true" referencePoint="0" size="179.156,189.279,mm" keepLayerSet="false" blendMode="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="112.643,4.09761,mm" drawCanvasItems="true">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="true" type="65639" positionOnPage="112.643,4.09761,mm" position="112.643,4.09761,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="179.156,189.279,mm" mapRotation="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" itemRotation="0" id="Trail Start" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95772328900195447" xmin="18.3924263991010406" xmax="18.42354248737832023" ymax="-33.92484901666441743"/>
+        <Extent ymax="-33.92484901666441743" xmin="18.3924263991010406" ymin="-33.95772328900195447" xmax="18.42354248737832023"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="1" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" visibility="1" zValue="6" mapRotation="0" followPresetName="Routes" id="Left inset 21KM" position="5.86559,4.09761,mm" isTemporal="0" frame="true" referencePoint="0" size="67.7828,166.874,mm" keepLayerSet="false" blendMode="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="true" type="65639" positionOnPage="5.86559,4.09761,mm" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="67.7828,166.874,mm" mapRotation="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" itemRotation="0" id="Left inset 21KM" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94700000000000273" xmin="18.37399999999999878" xmax="18.38626092146919788" ymax="-33.91681492292400435"/>
+        <Extent ymax="-33.91681492292400435" xmin="18.37399999999999878" ymin="-33.94700000000000273" xmax="18.38626092146919788"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" visibility="1" zValue="5" mapRotation="0" followPresetName="Routes" id="Bottom inset 21KM" position="133.191,119.125,mm" isTemporal="0" frame="true" referencePoint="0" size="113.3,76.1023,mm" keepLayerSet="false" blendMode="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="133.191,119.125,mm" drawCanvasItems="true">
-        <FrameColor red="103" green="34" blue="144" alpha="255"/>
-        <BackgroundColor red="200" green="175" blue="215" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="true" type="65639" positionOnPage="133.191,119.125,mm" position="133.191,119.125,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="113.3,76.1023,mm" mapRotation="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" itemRotation="0" id="Bottom inset 21KM" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" followPreset="true" blendMode="0">
+        <FrameColor blue="144" green="34" red="103" alpha="255"/>
+        <BackgroundColor blue="215" green="175" red="200" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.9168317482614512" xmin="18.41509620662891678" xmax="18.42329132157224336" ymax="-33.91132718340826813"/>
+        <Extent ymax="-33.91132718340826813" xmin="18.41509620662891678" ymin="-33.9168317482614512" xmax="18.42329132157224336"/>
         <LayerSet/>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="1" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" visibility="0" zValue="4" mapRotation="0" followPresetName="Routes" id="End inset Trail" position="19.6693,7.89412,mm" isTemporal="0" frame="true" referencePoint="0" size="68.3676,117.12,mm" keepLayerSet="false" blendMode="0" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="19.6693,7.89412,mm" drawCanvasItems="true">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="4" background="true" type="65639" positionOnPage="19.6693,7.89412,mm" position="19.6693,7.89412,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="68.3676,117.12,mm" mapRotation="0" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" itemRotation="0" id="End inset Trail" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="0" positionLock="true" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.91454383501641701" xmin="18.4044900556177744" xmax="18.41240136424316276" ymax="-33.90099106513847005"/>
+        <Extent ymax="-33.90099106513847005" xmin="18.4044900556177744" ymin="-33.91454383501641701" xmax="18.41240136424316276"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="1" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" visibility="0" zValue="3" mapRotation="0" followPresetName="Routes" id="Start inset Trail" position="170.062,49.6297,mm" isTemporal="0" frame="true" referencePoint="0" size="63.655,88.3012,mm" keepLayerSet="false" blendMode="0" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="170.062,49.6297,mm" drawCanvasItems="true">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="true" type="65639" positionOnPage="170.062,49.6297,mm" position="170.062,49.6297,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="63.655,88.3012,mm" mapRotation="0" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" itemRotation="0" id="Start inset Trail" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="0" positionLock="true" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94823764719958348" xmin="18.41445559427620893" xmax="18.4185691326545431" ymax="-33.94253141264477591"/>
+        <Extent ymax="-33.94253141264477591" xmin="18.41445559427620893" ymin="-33.94823764719958348" xmax="18.4185691326545431"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="1" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" visibility="0" zValue="2" mapRotation="0" followPresetName="Routes" id="Contour inset Trail" position="200.321,125.314,mm" isTemporal="0" frame="true" referencePoint="0" size="75.8756,69.7635,mm" keepLayerSet="false" blendMode="0" uuid="{917a530c-14f4-4ed8-b109-961939435221}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="200.321,125.314,mm" drawCanvasItems="true">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="true" type="65639" positionOnPage="200.321,125.314,mm" position="200.321,125.314,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="75.8756,69.7635,mm" mapRotation="0" uuid="{917a530c-14f4-4ed8-b109-961939435221}" itemRotation="0" id="Contour inset Trail" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="0" positionLock="true" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95702588572736147" xmin="18.41234259163472942" xmax="18.42332635419156972" ymax="-33.94692690566557047"/>
+        <Extent ymax="-33.94692690566557047" xmin="18.41234259163472942" ymin="-33.95702588572736147" xmax="18.42332635419156972"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="1" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="round" mapFlags="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" visibility="1" zValue="1" mapRotation="0" followPresetName="Routes" id="Main Map" position="9.50144,5.50066,mm" isTemporal="0" frame="true" referencePoint="0" size="282.372,186.105,mm" keepLayerSet="false" blendMode="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" groupUuid="" opacity="1" type="65639" positionLock="false" excludeFromExports="0" outlineWidthM="0.15,mm" labelMargin="0,mm" positionOnPage="9.50144,5.50066,mm" drawCanvasItems="true">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="round" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="9.50144,5.50066,mm" position="9.50144,5.50066,mm" outlineWidthM="0.15,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="282.372,186.105,mm" mapRotation="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" itemRotation="0" id="Main Map" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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.392'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.392'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95900000000000318" xmin="18.36400000000000077" xmax="18.45388998618362919" ymax="-33.89975544251798567"/>
+        <Extent ymax="-33.89975544251812778" xmin="18.36400000000000077" ymin="-33.95900000000000318" xmax="18.45388998618362919"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="0" bottomAnnotationDirection="0" intervalY="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="0" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalX="0" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="0" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="0" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" name="Grid 1" frameAnnotationDistance="1" unit="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0,0,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{53251229-a00c-4ec1-9df9-51bea540c4e3}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31437,51 +26986,40 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview inverted="0" blendMode="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" centered="0" name="Overview 1" show="1" position="3">
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <ComposerMapOverview uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" name="Overview 1" position="3" centered="0" inverted="0" blendMode="0" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="alpha">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression"/>
-                    <Option type="int" value="3" name="type"/>
+                <Option name="name" value="" type="QString"/>
+                <Option name="properties" type="Map">
+                  <Option name="alpha" type="Map">
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                 </Option>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{c70687b6-ebcb-4a4f-9196-528667fd884e}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="103,34,144,26" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="103,34,144,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="103,34,144,26" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="103,34,144,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="103,34,144,26" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="103,34,144,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31489,9 +27027,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31499,137 +27037,115 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="2" margin="0.06" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.06" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="int" value="0" name="forceVector"/>
-          <Option type="QString" value="true" name="imageAntialias"/>
-          <Option type="QString" value="0" name="imageCropMarginBottom"/>
-          <Option type="QString" value="0" name="imageCropMarginLeft"/>
-          <Option type="QString" value="0" name="imageCropMarginRight"/>
-          <Option type="QString" value="0" name="imageCropMarginTop"/>
-          <Option type="QString" value="false" name="imageCropToContents"/>
-          <Option type="int" value="1" name="pdfAppendGeoreference"/>
-          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
-          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="" name="pdfExportThemes"/>
-          <Option type="int" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" name="pdfLayerOrder"/>
-          <Option type="int" value="0" name="pdfLosslessImages"/>
-          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
-          <Option type="int" value="1" name="pdfSimplify"/>
-          <Option type="int" value="0" name="pdfTextFormat"/>
-          <Option type="QString" value="true" name="singleFile"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortKey="&quot;Sort&quot;" filterFeatures="1" coverageLayerName="all_routes" hideCoverage="0" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" pageNameExpression="&quot;Distance&quot;" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas sortKey="&quot;Sort&quot;" filterFeatures="1" pageNameExpression="&quot;Distance&quot;" coverageLayerName="all_routes" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerProvider="ogr" sortAscending="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="1" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="120" units="mm" name="Marshal Plan A1">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Marshal Plan A1" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{65fd4b73-0525-4952-b52a-060921d10d24}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="594,841,mm" blendMode="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="594,841,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{ca38df31-0d5f-4457-be79-18d8add56004}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31637,15 +27153,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" wrapChar="" fontColor="#000000" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" equalColumnWidth="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" wmsLegendWidth="50" referencePoint="0" outlineWidthM="0.3,mm" id="" lineSpacing="1" symbolAlignment="1" itemRotation="0" minSymbolSize="0" maxSymbolSize="0" symbolHeight="4" zValue="8" type="65642" position="25.5925,18.7971,mm" opacity="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" visibility="1" background="true" resizeToContents="1" rasterBorderColor="0,0,0,255" size="4,4,mm" excludeFromExports="0" rasterBorderWidth="0" frame="false" titleAlignment="1" blendMode="0" positionOnPage="25.5925,18.7971,mm" legendFilterByAtlas="0" frameJoinStyle="miter" groupUuid="" symbolWidth="7" boxSpace="2" positionLock="true" splitLayer="0" title="" columnCount="1" wmsLegendHeight="25" rasterBorder="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="8" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="25.5925,18.7971,mm" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="25.5925,18.7971,mm" minSymbolSize="0" frame="false" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" groupUuid="" size="4,4,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="7" positionLock="true">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31653,37 +27169,262 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.6444479999999997" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="16" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="group" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="1" indent="0" name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="1">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" indent="0" name="symbol" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" marginLeft="2" indent="0" name="symbolLabel" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer expanded="1" id="all_routes20170907054841602" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="all_routes" patch_size="0,0">
+            <layer-tree-layer name="all_routes" id="all_routes20170907054841602" expanded="1" legend_exp="" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" name="expandedLegendNodes"/>
-                  <Option type="QString" value="1,2,3" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
-                  <Option type="QString" value="0" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString"/>
+                  <Option name="legend/node-order" value="1,2,3" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -31691,240 +27432,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" visibility="1" valign="64" zValue="7" marginX="1" labelText="MARSHAL POSITIONS" id="" position="5.2963,808.939,mm" frame="false" referencePoint="0" size="91.9494,15.0649,mm" blendMode="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="5.2963,808.939,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="false" type="65641" labelText="MARSHAL POSITIONS" positionOnPage="5.2963,808.939,mm" position="5.2963,808.939,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="91.9494,15.0649,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" visibility="1" valign="32" zValue="5" marginX="1" labelText="REVISION 1.2" id="" position="430.403,825.052,mm" frame="false" referencePoint="0" size="56.6212,15.3656,mm" blendMode="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="430.403,825.052,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="REVISION 1.2" positionOnPage="430.403,825.052,mm" position="430.403,825.052,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="56.6212,15.3656,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" visibility="1" valign="64" zValue="4" marginX="1" labelText="Sunday, 20 October 2019" id="" position="372.175,808.942,mm" frame="false" referencePoint="0" size="114.848,15.0635,mm" blendMode="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="372.175,808.942,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="4" background="false" type="65641" labelText="Sunday, 20 October 2019" positionOnPage="372.175,808.942,mm" position="372.175,808.942,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="114.848,15.0635,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../Gun_Run_Logo.png" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" anchorPoint="8" visibility="1" zValue="3" pictureHeight="63.9757" id="" svgBorderColor="0,0,0,255" position="489.557,775.395,mm" pictureWidth="63.5856" mode="1" frame="false" referencePoint="0" size="100.498,63.9757,mm" resizeMode="0" blendMode="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="489.557,775.395,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="3" background="false" mode="1" type="65640" file="../Gun_Run_Logo.png" positionOnPage="489.557,775.395,mm" position="489.557,775.395,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="63.5856" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="8" frame="false" groupUuid="" excludeFromExports="0" size="100.498,63.9757,mm" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" northOffset="0" blendMode="0" pictureHeight="63.9757">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31932,232 +27640,199 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" visibility="1" zValue="2" id="" position="5.4463,824.155,mm" frame="false" referencePoint="0" size="481.428,0.606138,mm" cornerRadiusMeasure="0,mm" blendMode="0" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" groupUuid="" opacity="1" shapeType="1" type="65643" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="5.4463,824.155,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="false" type="65643" positionOnPage="5.4463,824.155,mm" position="5.4463,824.155,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="481.428,0.606138,mm" cornerRadiusMeasure="0,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="0,0,0,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="solid" name="outline_style"/>
-              <Option type="QString" value="0.3" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" visibility="1" zValue="1" mapRotation="0" followPresetName="Marshal plan" id="" position="3.94474,5.25965,mm" isTemporal="0" frame="true" referencePoint="0" size="584.759,811.213,mm" keepLayerSet="false" blendMode="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="3.94474,5.25965,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="3.94474,5.25965,mm" position="3.94474,5.25965,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="584.759,811.213,mm" mapRotation="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" itemRotation="0" id="" isTemporal="0" followPresetName="Marshal plan" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95821655848814657" xmin="18.37434415142052657" xmax="18.42299397558693741" ymax="-33.89072661913806428"/>
+        <Extent ymax="-33.89072661913806428" xmin="18.37434415142052657" ymin="-33.95821655848814657" xmax="18.42299397558693741"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="QString" value="0" name="forceVector"/>
-          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" sortFeatures="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortKey="page" filterFeatures="0" coverageLayerName="complete_marshal_overview" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" coverageLayerProvider="virtual" enabled="1"/>
+      <Atlas sortKey="page" filterFeatures="0" pageNameExpression="&quot;page&quot;" coverageLayerName="complete_marshal_overview" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerProvider="virtual" sortAscending="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="144" units="mm" name="Access Roads">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Access Roads" printResolution="144" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,210,mm" blendMode="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{038e2492-f412-42ba-8703-4c8f318a87c2}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide units="mm" orientation="2" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem columnSpace="2" wrapChar="" fontColor="#000000" equalColumnWidth="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" wmsLegendWidth="50" referencePoint="0" outlineWidthM="0.3,mm" id="" lineSpacing="1" symbolAlignment="1" itemRotation="0" minSymbolSize="0" maxSymbolSize="0" symbolHeight="4" zValue="15" type="65642" position="244.484,130.172,mm" opacity="1" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" visibility="1" background="true" resizeToContents="1" rasterBorderColor="0,0,0,255" size="34.45,40.8,mm" excludeFromExports="0" rasterBorderWidth="0" frame="true" titleAlignment="1" blendMode="0" positionOnPage="244.484,130.172,mm" legendFilterByAtlas="0" frameJoinStyle="miter" groupUuid="" symbolWidth="7" boxSpace="2" positionLock="true" splitLayer="0" title="" columnCount="1" wmsLegendHeight="25" rasterBorder="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="185"/>
+      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="15" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="244.484,130.172,mm" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="244.484,130.172,mm" minSymbolSize="0" frame="true" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="0" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" groupUuid="" size="34.45,40.8,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="7" positionLock="true">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="185"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32165,35 +27840,260 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="3" indent="0" name="group" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="group" indent="0" marginTop="3">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="3" indent="0" name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="3">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" marginLeft="2" indent="0" name="symbolLabel" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0" italic="0" style="Regular" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Residents Access">
+          <layer-tree-group name="Residents Access" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads" patch_size="0,0">
+            <layer-tree-layer name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" legend_exp="" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -32201,240 +28101,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" visibility="1" valign="64" zValue="8" marginX="0" labelText="ACCESS ROUTES FOR RESIDENTS" id="" position="9.37446,191.81,mm" frame="false" referencePoint="0" size="194.851,7.272,mm" blendMode="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="9.37446,191.81,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="ACCESS ROUTES FOR RESIDENTS" positionOnPage="9.37446,191.81,mm" position="9.37446,191.81,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="194.851,7.272,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="14" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" visibility="1" valign="64" zValue="6" marginX="1" labelText="REVISION 1.1" id="" position="204.225,191.81,mm" frame="false" referencePoint="0" size="57.4836,6.8714,mm" blendMode="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="204.225,191.81,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="REVISION 1.1" positionOnPage="204.225,191.81,mm" position="204.225,191.81,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="57.4836,6.8714,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" visibility="1" valign="64" zValue="5" marginX="1" labelText="Sunday, 20 October 2019" id="" position="210.038,199.082,mm" frame="false" referencePoint="0" size="51.6706,6.60801,mm" blendMode="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="210.038,199.082,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="Sunday, 20 October 2019" positionOnPage="210.038,199.082,mm" position="210.038,199.082,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.6706,6.60801,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../Gun_Run_Logo.png" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" anchorPoint="4" visibility="1" zValue="4" pictureHeight="17.4718" id="" svgBorderColor="0,0,0,255" position="262.196,188.218,mm" pictureWidth="17.3653" mode="1" frame="false" referencePoint="0" size="29.7523,17.4718,mm" resizeMode="0" blendMode="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="0" excludeFromExports="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="262.196,188.218,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="1" type="65640" file="../Gun_Run_Logo.png" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="17.3653" svgFillColor="255,255,255,255" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" anchorPoint="4" frame="false" groupUuid="" excludeFromExports="0" size="29.7523,17.4718,mm" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" northOffset="0" blendMode="0" pictureHeight="17.4718">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32442,111 +28309,100 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" visibility="1" zValue="3" id="" position="9.59946,198.832,mm" frame="false" referencePoint="0" size="251.959,0.1,mm" cornerRadiusMeasure="0,mm" blendMode="0" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" groupUuid="" opacity="1" shapeType="1" type="65643" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="9.59946,198.832,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65643" positionOnPage="9.59946,198.832,mm" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="251.959,0.1,mm" cornerRadiusMeasure="0,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{5ba70802-6163-45fd-99da-6e7d106e21ac}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="0,0,0,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="solid" name="outline_style"/>
-              <Option type="QString" value="0.3" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" visibility="1" zValue="2" mapRotation="0" followPresetName="Access Routes" id="" position="5.86559,4.09761,mm" isTemporal="0" frame="true" referencePoint="0" size="67.7828,166.874,mm" keepLayerSet="false" blendMode="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="true" type="65639" positionOnPage="5.86559,4.09761,mm" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="67.7828,166.874,mm" mapRotation="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" itemRotation="0" id="" isTemporal="0" followPresetName="Access Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94652930000000168" xmin="18.37288570000000121" xmax="18.38563681624126289" ymax="-33.91513741583252539"/>
+        <Extent ymax="-33.91513741583252539" xmin="18.37288570000000121" ymin="-33.94652930000000168" xmax="18.38563681624126289"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -32561,206 +28417,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="0" bottomAnnotationDirection="0" intervalY="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="0" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" intervalX="0" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="0" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="0" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" name="Grid 1" frameAnnotationDistance="1" unit="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0,0,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32768,45 +28567,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="round" mapFlags="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" visibility="1" zValue="1" mapRotation="0" followPresetName="Access Routes" id="" position="9.44946,9.08557,mm" isTemporal="0" frame="true" referencePoint="0" size="282.012,175.592,mm" keepLayerSet="false" blendMode="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.15,mm" labelMargin="0,mm" positionOnPage="9.44946,9.08557,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="round" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="9.44946,9.08557,mm" position="9.44946,9.08557,mm" outlineWidthM="0.15,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="282.012,175.592,mm" mapRotation="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" itemRotation="0" id="" isTemporal="0" followPresetName="Access Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.92999999999999972" xmin="18.37000000000000099" xmax="18.42303507276415431" ymax="-33.89697816224119009"/>
+        <Extent ymax="-33.89697816224119009" xmin="18.37000000000000099" ymin="-33.92999999999999972" xmax="18.42303507276415431"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -32821,206 +28620,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="0" bottomAnnotationDirection="0" intervalY="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="0" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalX="0" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="0" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="0" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" name="Grid 1" frameAnnotationDistance="1" unit="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{ebfdf781-190f-4651-9709-789cb68c9533}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0,0,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33028,373 +28770,318 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="QString" value="0" name="forceVector"/>
-          <Option type="QString" value="true" name="imageAntialias"/>
-          <Option type="QString" value="0" name="imageCropMarginBottom"/>
-          <Option type="QString" value="0" name="imageCropMarginLeft"/>
-          <Option type="QString" value="0" name="imageCropMarginRight"/>
-          <Option type="QString" value="0" name="imageCropMarginTop"/>
-          <Option type="QString" value="false" name="imageCropToContents"/>
-          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="0" name="pdfTextFormat"/>
-          <Option type="QString" value="false" name="singleFile"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0" coverageLayerName="residents_access" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas filterFeatures="0" pageNameExpression="&quot;FID&quot;" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="1" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0"/>
     </Layout>
-    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" printResolution="144" units="mm" name="Golf Course Access">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Golf Course Access" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{c6a999b7-046a-4375-b775-24bfc19b454c}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,210,mm" blendMode="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{cef79093-d3c5-4edf-9190-66f460844f01}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide units="mm" orientation="2" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" visibility="1" valign="64" zValue="8" marginX="0" labelText="Access to P9 Parking and VIP Tent" id="" position="9.37446,191.81,mm" frame="false" referencePoint="0" size="194.851,7.272,mm" blendMode="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="9.37446,191.81,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="Access to P9 Parking and VIP Tent" positionOnPage="9.37446,191.81,mm" position="9.37446,191.81,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="194.851,7.272,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="14" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" visibility="1" valign="64" zValue="6" marginX="1" labelText="REVISION 1.0" id="" position="204.225,191.81,mm" frame="false" referencePoint="0" size="57.4836,6.8714,mm" blendMode="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="204.225,191.81,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="REVISION 1.0" positionOnPage="204.225,191.81,mm" position="204.225,191.81,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="57.4836,6.8714,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" visibility="1" valign="64" zValue="5" marginX="1" labelText="Sunday, 20 October 2019" id="" position="210.038,199.082,mm" frame="false" referencePoint="0" size="51.6706,6.60801,mm" blendMode="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="210.038,199.082,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="Sunday, 20 October 2019" positionOnPage="210.038,199.082,mm" position="210.038,199.082,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.6706,6.60801,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../Gun_Run_Logo.png" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" anchorPoint="4" visibility="1" zValue="4" pictureHeight="17.4718" id="" svgBorderColor="0,0,0,255" position="262.196,188.218,mm" pictureWidth="17.3653" mode="1" frame="false" referencePoint="0" size="29.7523,17.4718,mm" resizeMode="0" blendMode="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="262.196,188.218,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="1" type="65640" file="../Gun_Run_Logo.png" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="17.3653" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="4" frame="false" groupUuid="" excludeFromExports="0" size="29.7523,17.4718,mm" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" northOffset="0" blendMode="0" pictureHeight="17.4718">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33402,96 +29089,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" visibility="1" zValue="3" id="" position="9.59946,198.832,mm" frame="false" referencePoint="0" size="251.959,0.1,mm" cornerRadiusMeasure="0,mm" blendMode="0" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" groupUuid="" opacity="1" shapeType="1" type="65643" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="9.59946,198.832,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65643" positionOnPage="9.59946,198.832,mm" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="251.959,0.1,mm" cornerRadiusMeasure="0,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{025604c1-b118-4f15-b140-54c9145260c4}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="0,0,0,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="solid" name="outline_style"/>
-              <Option type="QString" value="0.3" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="false" frameJoinStyle="round" mapFlags="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" visibility="1" zValue="1" mapRotation="0" followPresetName="" id="" position="9.44946,7.25098,mm" isTemporal="0" frame="false" referencePoint="0" size="282.012,182.649,mm" keepLayerSet="false" blendMode="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" groupUuid="" opacity="1" type="65639" positionLock="false" excludeFromExports="0" outlineWidthM="0.15,mm" labelMargin="0,mm" positionOnPage="9.44946,7.25098,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="round" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="9.44946,7.25098,mm" position="9.44946,7.25098,mm" outlineWidthM="0.15,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="282.012,182.649,mm" mapRotation="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" itemRotation="0" id="" isTemporal="0" followPresetName="" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="false" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" followPreset="false" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90848231674397084" xmin="18.40103928699269886" xmax="18.40919746780259914" ymax="-33.90319854486631357"/>
+        <Extent ymax="-33.90319854486631357" xmin="18.40103928699269886" ymin="-33.90848231674397084" xmax="18.40919746780259914"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -33506,206 +29182,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="0" bottomAnnotationDirection="0" intervalY="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="0" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalX="0" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="0" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="0" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" name="Grid 1" frameAnnotationDistance="1" unit="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{260fd874-7bf9-43a4-af33-127e7baa77e4}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0,0,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33713,130 +29332,108 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="QString" value="0" name="forceVector"/>
-          <Option type="QString" value="true" name="imageAntialias"/>
-          <Option type="QString" value="0" name="imageCropMarginBottom"/>
-          <Option type="QString" value="0" name="imageCropMarginLeft"/>
-          <Option type="QString" value="0" name="imageCropMarginRight"/>
-          <Option type="QString" value="0" name="imageCropMarginTop"/>
-          <Option type="QString" value="false" name="imageCropToContents"/>
-          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="0" name="pdfTextFormat"/>
-          <Option type="QString" value="false" name="singleFile"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0" coverageLayerName="residents_access" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" enabled="0"/>
+      <Atlas filterFeatures="0" pageNameExpression="&quot;FID&quot;" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="120" units="mm" name="Marshal Plan">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Marshal Plan" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,420,mm" blendMode="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,420,mm" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{c29f549e-9e76-462f-a0fb-b0827382e76d}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -33844,161 +29441,139 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" visibility="1" valign="32" zValue="9" marginX="0" labelText="Page [% &quot;page&quot; %] " id="" position="112.086,406.476,mm" frame="false" referencePoint="0" size="23.5967,8.3142,mm" blendMode="0" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="1" outlineWidthM="0.3,mm" positionOnPage="112.086,406.476,mm" halign="4" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="9" background="false" type="65641" labelText="Page [% &quot;page&quot; %] " positionOnPage="112.086,406.476,mm" position="112.086,406.476,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="23.5967,8.3142,mm" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" itemRotation="0" id="" halign="4" visibility="1" positionLock="true" marginY="1" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" valign="32" blendMode="0" htmlState="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" visibility="1" valign="32" zValue="8" marginX="0" labelText="REVISION 5.0" id="" position="214.292,406.874,mm" frame="false" referencePoint="0" size="27.7839,7.51682,mm" blendMode="0" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="214.292,406.874,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="REVISION 5.0" positionOnPage="214.292,406.874,mm" position="214.292,406.874,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="27.7839,7.51682,mm" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem columnSpace="2" wrapChar="" fontColor="#000000" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" equalColumnWidth="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" wmsLegendWidth="50" referencePoint="0" outlineWidthM="0.3,mm" id="" lineSpacing="1" symbolAlignment="1" itemRotation="0" minSymbolSize="0" maxSymbolSize="0" symbolHeight="4" zValue="7" type="65642" position="15.6525,12.5708,mm" opacity="1" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" visibility="1" background="true" resizeToContents="1" rasterBorderColor="0,0,0,255" size="21.6797,33,mm" excludeFromExports="0" rasterBorderWidth="0" frame="false" titleAlignment="1" blendMode="0" positionOnPage="15.6525,12.5708,mm" legendFilterByAtlas="0" frameJoinStyle="miter" groupUuid="" symbolWidth="7" boxSpace="2" positionLock="true" splitLayer="0" title="" columnCount="1" wmsLegendHeight="25" rasterBorder="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="7" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="15.6525,12.5708,mm" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="15.6525,12.5708,mm" minSymbolSize="0" frame="false" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" groupUuid="" size="21.6797,33,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="7" positionLock="true">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34006,37 +29581,262 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.6444479999999997" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="16" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="group" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="1" indent="0" name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="1">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" indent="0" name="symbol" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" marginLeft="2" indent="0" name="symbolLabel" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="all_routes" source="./all_routes.shp|layername=all_routes" patch_size="0,0">
+            <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
-                  <Option type="int" value="0" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -34044,240 +29844,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" visibility="1" valign="64" zValue="6" marginX="0" labelText="MARSHAL POSITIONS" id="" position="5.69321,398.344,mm" frame="false" referencePoint="0" size="45.1194,8.13137,mm" blendMode="0" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="5.69321,398.344,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="MARSHAL POSITIONS" positionOnPage="5.69321,398.344,mm" position="5.69321,398.344,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="45.1194,8.13137,mm" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" visibility="1" valign="32" zValue="5" marginX="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>" id="" position="5.69321,406.988,mm" frame="false" referencePoint="0" size="118.192,7.80192,mm" blendMode="0" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="1" outlineWidthM="0.3,mm" positionOnPage="5.69321,406.988,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" 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>" positionOnPage="5.69321,406.988,mm" position="5.69321,406.988,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="118.192,7.80192,mm" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" valign="32" blendMode="0" htmlState="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" visibility="1" valign="64" zValue="4" marginX="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>" id="" position="148.501,398.344,mm" frame="false" referencePoint="0" size="93.5757,8.13167,mm" blendMode="0" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="1" outlineWidthM="0.3,mm" positionOnPage="148.501,398.344,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="4" background="false" type="65641" 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>" positionOnPage="148.501,398.344,mm" position="148.501,398.344,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="93.5757,8.13167,mm" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" valign="64" blendMode="0" htmlState="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../GunRun2022_250.png" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" anchorPoint="8" visibility="1" zValue="3" pictureHeight="26.4325" id="" svgBorderColor="0,0,0,255" position="243.319,382.696,mm" pictureWidth="49.3143" mode="1" frame="false" referencePoint="0" size="49.3143,31.2967,mm" resizeMode="0" blendMode="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="243.319,382.696,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="3" background="false" mode="1" type="65640" file="../GunRun2022_250.png" positionOnPage="243.319,382.696,mm" position="243.319,382.696,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="31.1059" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="8" frame="false" groupUuid="" excludeFromExports="0" size="49.3143,31.2967,mm" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" northOffset="0" blendMode="0" pictureHeight="31.2967">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34285,221 +30052,188 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" visibility="1" zValue="2" id="" position="5.84321,406.626,mm" frame="false" referencePoint="0" size="236.083,0.14328,mm" cornerRadiusMeasure="0,mm" blendMode="0" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" groupUuid="" opacity="1" shapeType="1" type="65643" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="5.84321,406.626,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="false" type="65643" positionOnPage="5.84321,406.626,mm" position="5.84321,406.626,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="236.083,0.14328,mm" cornerRadiusMeasure="0,mm" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="0,0,0,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="solid" name="outline_style"/>
-              <Option type="QString" value="0.3" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" visibility="1" zValue="1" mapRotation="0" followPresetName="Marshal plan" id="" position="5.03,5.9483,mm" isTemporal="0" frame="false" referencePoint="0" size="286.94,392.396,mm" keepLayerSet="false" blendMode="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="5.03,5.9483,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="5.03,5.9483,mm" position="5.03,5.9483,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="286.94,392.396,mm" mapRotation="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" itemRotation="0" id="" isTemporal="0" followPresetName="Marshal plan" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.91890002608484167" xmin="18.39785407807089612" xmax="18.41474568521422484" ymax="-33.89580042337001231"/>
+        <Extent ymax="-33.89580042337001231" xmin="18.39785407807089612" ymin="-33.91890002608484167" xmax="18.41474568521422484"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="int" value="0" name="forceVector"/>
-          <Option type="int" value="1" name="pdfAppendGeoreference"/>
-          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
-          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="" name="pdfExportThemes"/>
-          <Option type="int" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" name="pdfLayerOrder"/>
-          <Option type="int" value="0" name="pdfLosslessImages"/>
-          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
-          <Option type="int" value="1" name="pdfSimplify"/>
-          <Option type="int" value="0" name="pdfTextFormat"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
         </Option>
       </customproperties>
-      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortFeatures="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortKey="page" filterFeatures="0" coverageLayerName="marshal_overviews" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas sortKey="page" filterFeatures="0" pageNameExpression="&quot;page&quot;" coverageLayerName="marshal_overviews" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerProvider="ogr" sortAscending="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="300" units="mm" name="Fencing - Cones only">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Fencing - Cones only" printResolution="300" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{33898621-24b6-4a0f-ad6f-29711c6feb21}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,210,mm" blendMode="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -34507,15 +30241,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" wrapChar="" fontColor="#000000" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" equalColumnWidth="1" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" wmsLegendWidth="50" referencePoint="0" outlineWidthM="0.3,mm" id="" lineSpacing="1" symbolAlignment="1" itemRotation="0" minSymbolSize="0" maxSymbolSize="0" symbolHeight="4" zValue="11" type="65642" position="256.808,5.21277,mm" opacity="1" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" visibility="1" background="true" resizeToContents="0" rasterBorderColor="0,0,0,255" size="38.1563,53.7608,mm" excludeFromExports="0" rasterBorderWidth="0" frame="true" titleAlignment="1" blendMode="0" positionOnPage="256.808,5.21277,mm" legendFilterByAtlas="0" frameJoinStyle="miter" groupUuid="" symbolWidth="7" boxSpace="2" positionLock="true" splitLayer="0" title="" columnCount="1" wmsLegendHeight="25" rasterBorder="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="11" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="256.808,5.21277,mm" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" frame="true" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" groupUuid="" size="38.1563,53.7608,mm" symbolAlignment="1" blendMode="0" resizeToContents="0" symbolWidth="7" positionLock="true">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34523,53 +30257,278 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" bold="1" italic="0" style="Bold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="3" indent="0" name="group" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="group" indent="0" marginTop="3">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="3" indent="0" name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="3">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" marginLeft="2" indent="0" name="symbolLabel" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0" italic="0" style="Regular" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Fencing and Cones">
+          <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="fencing" source="./fencing.shp|layername=fencing" patch_size="0,0">
+            <layer-tree-layer name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_exp="" patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
-                  <Option type="QString" value="" name="legend/expressionFilter"/>
-                  <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
-                  <Option type="QString" value="1,4" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
+                  <Option name="legend/expressionFilter" value="" type="QString"/>
+                  <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+                  <Option name="legend/node-order" value="1,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="all_routes" source="./all_routes.shp|layername=all_routes" patch_size="0,0">
+            <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
-                  <Option type="int" value="0" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -34577,459 +30536,393 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" visibility="1" valign="32" zValue="10" marginX="0" labelText="CONES: [% &quot;name&quot; %]" id="" position="6.76779,191.188,mm" frame="false" referencePoint="0" size="148.46,6.45211,mm" blendMode="0" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="6.76779,191.188,mm" halign="1" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="10" background="false" type="65641" labelText="CONES: [% &quot;name&quot; %]" positionOnPage="6.76779,191.188,mm" position="6.76779,191.188,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="148.46,6.45211,mm" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" visibility="1" valign="64" zValue="9" marginX="0" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" id="" position="182.723,191.188,mm" frame="false" referencePoint="0" size="56.3557,6.45237,mm" blendMode="0" uuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="1" outlineWidthM="0.3,mm" positionOnPage="182.723,191.188,mm" halign="2" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="9" background="false" type="65641" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" positionOnPage="182.723,191.188,mm" position="182.723,191.188,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="56.3557,6.45237,mm" uuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" valign="64" blendMode="0" htmlState="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" visibility="1" valign="32" zValue="8" marginX="0" labelText="REVISION 5.0" id="" position="209.146,198.083,mm" frame="false" referencePoint="0" size="26.8205,6.82826,mm" blendMode="0" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="209.146,198.083,mm" halign="2" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="REVISION 3.0" positionOnPage="209.146,198.083,mm" position="209.146,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="26.8205,6.82826,mm" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" visibility="0" valign="32" zValue="7" marginX="1" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" id="" position="62.6706,198.083,mm" frame="false" referencePoint="0" size="51.1638,7.07327,mm" blendMode="0" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="62.6706,198.083,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="false" type="65641" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" positionOnPage="62.6706,198.083,mm" position="62.6706,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.1638,7.07327,mm" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" itemRotation="0" id="" halign="1" visibility="0" positionLock="true" marginY="1" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" visibility="1" valign="32" zValue="6" marginX="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" id="" position="116.805,198.083,mm" frame="false" referencePoint="0" size="64.7594,7.10512,mm" blendMode="0" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="116.805,198.083,mm" halign="1" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" positionOnPage="116.805,198.083,mm" position="116.805,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="64.7594,7.10512,mm" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" visibility="1" valign="32" zValue="5" marginX="0" labelText="Page [% @atlas_featurenumber %]" id="" position="6.76779,198.083,mm" frame="false" referencePoint="0" size="90.2083,7.07327,mm" blendMode="0" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="6.76779,198.083,mm" halign="1" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="Page [% @atlas_featurenumber %]" positionOnPage="6.76779,198.083,mm" position="6.76779,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="90.2083,7.07327,mm" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../GunRun2022_250.png" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" anchorPoint="8" visibility="1" zValue="4" pictureHeight="26.4325" id="" svgBorderColor="0,0,0,255" position="243.098,175.353,mm" pictureWidth="49.3143" mode="1" frame="false" referencePoint="0" size="49.3143,29.8354,mm" resizeMode="0" blendMode="0" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="243.098,175.353,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="1" type="65640" file="../GunRun2022_250.png" positionOnPage="243.098,175.353,mm" position="243.098,175.353,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="29.6535" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="8" frame="false" groupUuid="" excludeFromExports="0" size="49.3143,29.8354,mm" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" northOffset="0" blendMode="0" pictureHeight="29.8354">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35037,505 +30930,380 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" visibility="1" zValue="3" id="" position="6.91779,197.79,mm" frame="false" referencePoint="0" size="232.01,0.14328,mm" cornerRadiusMeasure="0,mm" blendMode="0" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" groupUuid="" opacity="1" shapeType="1" type="65643" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="6.91779,197.79,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65643" positionOnPage="6.91779,197.79,mm" position="6.91779,197.79,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="232.01,0.14328,mm" cornerRadiusMeasure="0,mm" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{96fb0bca-784b-4a29-b691-c08ef223150d}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="0,0,0,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="solid" name="outline_style"/>
-              <Option type="QString" value="0.3" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem maxBarWidth="100" minBarWidth="25" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" referencePoint="0" outlineWidthM="0.3,mm" id="" labelBarSpace="1" itemRotation="0" lineJoinStyle="round" unitType="meters" segmentSizeMode="1" zValue="2" boxContentSpace="0.2" type="65646" numSubdivisions="1" segmentMillimeters="25.0725" position="6.76779,2.8482,mm" opacity="1" numUnitsPerSegment="30" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" visibility="1" background="false" numMapUnitsPerScaleBarUnit="1" numSegments="2" height="2" labelHorizontalPlacement="0" subdivisionsHeight="1.5" size="84.9787,15.8378,mm" excludeFromExports="0" numSegmentsLeft="2" frame="false" labelVerticalPlacement="0" outlineWidth="0.2" unitLabel="m" blendMode="0" positionOnPage="6.76779,2.8482,mm" frameJoinStyle="miter" groupUuid="" positionLock="true" style="Double Box" lineCapStyle="square" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" alignment="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem minBarWidth="25" opacity="1" lineJoinStyle="round" numSegmentsLeft="2" unitLabel="m" labelVerticalPlacement="0" segmentMillimeters="26.1864" numUnitsPerSegment="30" zValue="2" numSegments="2" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" segmentSizeMode="1" type="65646" subdivisionsHeight="1.5" height="2" numSubdivisions="1" lineCapStyle="square" outlineWidth="0.2" visibility="1" frameJoinStyle="miter" itemRotation="0" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" outlineWidthM="0.3,mm" positionOnPage="6.76779,2.8482,mm" frame="false" referencePoint="0" style="Double Box" unitType="meters" maxBarWidth="100" boxContentSpace="0.2" id="" background="false" excludeFromExports="0" labelHorizontalPlacement="0" alignment="0" groupUuid="" size="88.3204,15.8378,mm" blendMode="0" labelBarSpace="1" positionLock="true">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor red="0" green="0" blue="0" alpha="255"/>
+        <strokeColor blue="0" green="0" red="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="QChar" value="" name="decimal_separator"/>
-            <Option type="int" value="6" name="decimals"/>
-            <Option type="int" value="0" name="rounding_type"/>
-            <Option type="bool" value="false" name="show_plus"/>
-            <Option type="bool" value="true" name="show_thousand_separator"/>
-            <Option type="bool" value="false" name="show_trailing_zeros"/>
-            <Option type="QChar" value="" name="thousand_separator"/>
+            <Option name="decimal_separator" type="invalid"/>
+            <Option name="decimals" value="6" type="int"/>
+            <Option name="rounding_type" value="0" type="int"/>
+            <Option name="show_plus" value="false" type="bool"/>
+            <Option name="show_thousand_separator" value="true" type="bool"/>
+            <Option name="show_trailing_zeros" value="false" type="bool"/>
+            <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor red="0" green="0" blue="0" alpha="255"/>
-        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
+        <fillColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
         <lineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{ba8b697f-af10-49bc-b789-55678d099479}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.2" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.2" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.2" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.2" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.2" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.2" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{7f05af9e-0111-48af-a2c9-889d710570e0}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{c90aa551-e7ed-4710-acac-e5698540a53e}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" visibility="1" zValue="1" mapRotation="0" followPresetName="Cones" id="" position="6.76779,9.35102,mm" isTemporal="0" frame="false" referencePoint="0" size="283.418,180.92,mm" keepLayerSet="false" blendMode="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" groupUuid="" opacity="0.9" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="6.76779,9.35102,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="false" type="65639" positionOnPage="6.76779,9.35102,mm" position="6.76779,9.35102,mm" outlineWidthM="0.3,mm" opacity="0.9" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="283.418,180.92,mm" mapRotation="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" itemRotation="0" id="" isTemporal="0" followPresetName="Cones" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="Map" name="transformer">
-                    <Option type="Map" name="d">
-                      <Option type="double" value="1" name="exponent"/>
-                      <Option type="double" value="360" name="maxOutput"/>
-                      <Option type="double" value="0" name="maxValue"/>
-                      <Option type="double" value="0" name="minOutput"/>
-                      <Option type="double" value="0" name="minValue"/>
-                      <Option type="double" value="0" name="nullOutput"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="transformer" type="Map">
+                    <Option name="d" type="Map">
+                      <Option name="exponent" value="1" type="double"/>
+                      <Option name="maxOutput" value="360" type="double"/>
+                      <Option name="maxValue" value="0" type="double"/>
+                      <Option name="minOutput" value="0" type="double"/>
+                      <Option name="minValue" value="0" type="double"/>
+                      <Option name="nullOutput" value="0" type="double"/>
                     </Option>
-                    <Option type="int" value="0" name="t"/>
+                    <Option name="t" value="0" type="int"/>
                   </Option>
-                  <Option type="int" value="3" name="type"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="angle" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="angle" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90219936134110412" xmin="18.40670677609450223" xmax="18.40975312970203248" ymax="-33.90025472328818523"/>
+        <Extent ymax="-33.91866254684331494" xmin="18.38081056635935795" ymin="-33.92052446432401069" xmax="18.3837273348683965"/>
         <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>
@@ -35550,138 +31318,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="3" bottomAnnotationDirection="0" intervalY="5" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="3" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalX="5" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="3" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="4" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="3" name="Grid 1" frameAnnotationDistance="1" unit="1" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="3" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="1" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="3" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="3" bottomAnnotationPosition="1" annotationFormat="4" intervalX="5" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="3" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="5" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{7f8bc30c-a977-4770-97ae-b052397815c8}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="195,195,195,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="195,195,195,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="195,195,195,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{490d72bf-21ae-4699-adef-94db3e5bc496}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -35698,69 +31420,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -35768,46 +31479,46 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="int" value="0" name="forceVector"/>
-          <Option type="QString" value="true" name="imageAntialias"/>
-          <Option type="QString" value="0" name="imageCropMarginBottom"/>
-          <Option type="QString" value="0" name="imageCropMarginLeft"/>
-          <Option type="QString" value="0" name="imageCropMarginRight"/>
-          <Option type="QString" value="0" name="imageCropMarginTop"/>
-          <Option type="QString" value="false" name="imageCropToContents"/>
-          <Option type="int" value="1" name="pdfAppendGeoreference"/>
-          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
-          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="0" name="pdfExportGeoPdfFeatures"/>
-          <Option type="QString" value="" name="pdfExportThemes"/>
-          <Option type="int" value="1" name="pdfIncludeMetadata"/>
-          <Option 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" name="pdfLayerOrder"/>
-          <Option type="int" value="0" name="pdfLosslessImages"/>
-          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
-          <Option type="int" value="1" name="pdfSimplify"/>
-          <Option type="int" value="0" name="pdfTextFormat"/>
-          <Option type="QString" value="true" name="rasterize"/>
-          <Option type="bool" value="true" name="singleFile"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportGeoPdfFeatures" value="0" type="QString"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="rasterize" value="true" type="QString"/>
+          <Option name="singleFile" value="true" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" sortFeatures="1" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" sortKey="&quot;group&quot;" filterFeatures="0" coverageLayerName="cone_only_groups" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;" coverageLayerProvider="virtual" enabled="1"/>
+      <Atlas sortKey="&quot;group&quot;" filterFeatures="0" pageNameExpression="&quot;name&quot;" coverageLayerName="cone_only_groups" 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" sortAscending="1" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
-  <ProjectViewSettings UseProjectScales="0" rotation="0">
+  <ProjectViewSettings rotation="0" UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent ymin="-33.90381339025915253" xmin="18.40284388355583189" xmax="18.41822743815662733" ymax="-33.8995522642739715">
+    <DefaultViewExtent ymax="-33.89871642408721897" xmin="18.39262360336048019" ymin="-33.91404092163588047" xmax="18.42086732654766834">
       <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>
@@ -35821,42 +31532,58 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1" projectStyleId="attachment:///QnVUUv_styles.db">
+  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings cumulativeTemporalRange="0" frameRate="1" timeStepUnit="h" timeStep="1"/>
+  <ProjectTimeSettings frameRate="1" cumulativeTemporalRange="0" timeStep="1" timeStepUnit="h"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider offset="0" scale="1"/>
     </terrainProvider>
   </ElevationProperties>
-  <ProjectDisplaySettings>
+  <ProjectDisplaySettings CoordinateAxisOrder="Default" CoordinateType="MapCrs">
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option type="QChar" value="" name="decimal_separator"/>
-        <Option type="int" value="6" name="decimals"/>
-        <Option type="int" value="0" name="direction_format"/>
-        <Option type="int" value="0" name="rounding_type"/>
-        <Option type="bool" value="false" name="show_plus"/>
-        <Option type="bool" value="true" name="show_thousand_separator"/>
-        <Option type="bool" value="false" name="show_trailing_zeros"/>
-        <Option type="QChar" value="" name="thousand_separator"/>
+        <Option name="decimal_separator" type="invalid"/>
+        <Option name="decimals" value="6" type="int"/>
+        <Option name="direction_format" value="0" type="int"/>
+        <Option name="rounding_type" value="0" type="int"/>
+        <Option name="show_plus" value="false" type="bool"/>
+        <Option name="show_thousand_separator" value="true" type="bool"/>
+        <Option name="show_trailing_zeros" value="false" type="bool"/>
+        <Option name="thousand_separator" type="invalid"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option type="QString" value="DecimalDegrees" name="angle_format"/>
-        <Option type="QChar" value="" name="decimal_separator"/>
-        <Option type="int" value="6" name="decimals"/>
-        <Option type="int" value="0" name="rounding_type"/>
-        <Option type="bool" value="false" name="show_leading_degree_zeros"/>
-        <Option type="bool" value="false" name="show_leading_zeros"/>
-        <Option type="bool" value="false" name="show_plus"/>
-        <Option type="bool" value="false" name="show_suffix"/>
-        <Option type="bool" value="true" name="show_thousand_separator"/>
-        <Option type="bool" value="false" name="show_trailing_zeros"/>
-        <Option type="QChar" value="" name="thousand_separator"/>
+        <Option name="angle_format" value="DecimalDegrees" type="QString"/>
+        <Option name="decimal_separator" type="invalid"/>
+        <Option name="decimals" value="6" type="int"/>
+        <Option name="rounding_type" value="0" type="int"/>
+        <Option name="show_leading_degree_zeros" value="false" type="bool"/>
+        <Option name="show_leading_zeros" value="false" type="bool"/>
+        <Option name="show_plus" value="false" type="bool"/>
+        <Option name="show_suffix" value="false" type="bool"/>
+        <Option name="show_thousand_separator" value="true" type="bool"/>
+        <Option name="show_trailing_zeros" value="false" type="bool"/>
+        <Option name="thousand_separator" type="invalid"/>
       </Option>
     </GeographicCoordinateFormat>
+    <CoordinateCustomCrs>
+      <spatialrefsys nativeFormat="Wkt">
+        <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+        <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+        <srsid>3452</srsid>
+        <srid>4326</srid>
+        <authid>EPSG:4326</authid>
+        <description>WGS 84</description>
+        <projectionacronym>longlat</projectionacronym>
+        <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+        <geographicflag>true</geographicflag>
+      </spatialrefsys>
+    </CoordinateCustomCrs>
   </ProjectDisplaySettings>
+  <ProjectGpsSettings destinationLayerSource="Point?crs=EPSG:4326&amp;uid={98f1cf95-2d66-4e2b-ab42-5f814aa62a83}" destinationFollowsActiveLayer="1" destinationLayer="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" autoAddTrackVertices="0" destinationLayerProvider="memory" destinationLayerName="route_markers" autoCommitFeatures="0">
+    <timeStampFields/>
+  </ProjectGpsSettings>
 </qgis>
diff --git a/GIS Base Map/Gun Run.qgs.mldata b/GIS Base Map/Gun Run.qgs.mldata
index a4dfc0f..2805067 100644
Binary files a/GIS Base Map/Gun Run.qgs.mldata and b/GIS Base Map/Gun Run.qgs.mldata differ
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index 020f492..7da490e 100644
--- a/GIS Base Map/Gun Run.qgs~	
+++ b/GIS Base Map/Gun Run.qgs~	
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis saveDateTime="2022-09-16T01:53:58" version="3.26.3-Buenos Aires" saveUser="tim" projectname="Gun Run" saveUserFull="Timothy Allen">
+<qgis saveDateTime="2023-05-31T18:02:09" projectname="Gun Run" version="3.30.3-'s-Hertogenbosch" saveUserFull="Timothy Allen" saveUser="tim">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -17,273 +17,272 @@
       <geographicflag>true</geographicflag>
     </spatialrefsys>
   </projectCrs>
+  <elevation-shading-renderer edl-is-active="1" edl-distance-unit="0" light-azimuth="315" combined-method="0" edl-strength="1000" edl-distance="0.5" hillshading-is-active="0" is-active="0" hillshading-z-factor="1" light-altitude="45" hillshading-is-multidirectional="0"/>
   <layer-tree-group>
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Marshals">
+    <layer-tree-group name="Marshals" expanded="0" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="marshal_positions" source="./marshal_positions.shp|layername=marshal_positions" patch_size="0,0">
+      <layer-tree-layer name="marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" legend_exp="" patch_size="0,0" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="marshal_positions [456]" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option type="QString" value="" name="legend/expressionFilter"/>
-            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
-            <Option type="int" value="1" name="showFeatureCount"/>
+            <Option name="cached_name" value="marshal_positions [456]" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+            <Option name="showFeatureCount" value="1" type="int"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="extra_security20170921130834191" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="extra_security" source="./extra_security.shp" patch_size="0,0">
+      <layer-tree-layer name="extra_security" id="extra_security20170921130834191" expanded="1" legend_exp="" patch_size="0,0" source="./extra_security.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="extra_security" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" value="extra_security" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="marshals_by_position20161003112326575" providerKey="delimitedtext" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="marshals_by_position" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" patch_size="0,0">
+      <layer-tree-layer name="marshals_by_position" id="marshals_by_position20161003112326575" expanded="1" legend_exp="" patch_size="0,0" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="delimitedtext">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="marshals_by_position [457]" name="cached_name"/>
-            <Option type="int" value="1" name="showFeatureCount"/>
+            <Option name="cached_name" value="marshals_by_position [457]" type="QString"/>
+            <Option name="showFeatureCount" value="1" type="int"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="complete_marshal_overview" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" patch_size="0,0">
+      <layer-tree-layer name="complete_marshal_overview" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" expanded="1" legend_exp="" patch_size="0,0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="virtual">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="complete_marshal_overview" name="cached_name"/>
+            <Option name="cached_name" value="complete_marshal_overview" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="marshal_overviews" source="./marshal overviews.shp|layername=marshal overviews" patch_size="0,0">
+      <layer-tree-layer name="marshal_overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" expanded="0" legend_exp="" patch_size="0,0" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="marshal_overviews" name="cached_name"/>
-            <Option type="QString" value="" name="legend/expressionFilter"/>
-            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
+            <Option name="cached_name" value="marshal_overviews" type="QString"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Unchecked" groupLayer="" name="Fencing and Cones">
+    <layer-tree-group name="Fencing and Cones" expanded="0" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="fencing" source="./fencing.shp|layername=fencing" patch_size="0,0">
+      <layer-tree-layer name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_exp="" patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="fencing" name="cached_name"/>
-            <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
-            <Option type="QString" value="" name="legend/expressionFilter"/>
-            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
+            <Option name="cached_name" value="fencing" type="QString"/>
+            <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" providerKey="virtual" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="cone_only_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" patch_size="-1,-1">
+      <layer-tree-layer name="cone_only_groups" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" expanded="1" legend_exp="" 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" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="virtual">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="cone_only_groups" name="cached_name"/>
+            <Option name="cached_name" value="cone_only_groups" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" providerKey="virtual" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="fence_and_cone_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" patch_size="-1,-1">
+      <layer-tree-layer name="fence_and_cone_groups" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" expanded="1" legend_exp="" 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" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="virtual">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="fence_and_cone_groups" name="cached_name"/>
+            <Option name="cached_name" value="fence_and_cone_groups" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+    <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Markers">
+      <layer-tree-group name="Markers" expanded="1" checked="Qt::Checked" groupLayer="">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" providerKey="memory" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="route_markers" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={11ed0f81-3f12-40bd-8e45-084ec6d28146}" patch_size="-1,-1">
+        <layer-tree-layer name="route_markers" id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" expanded="1" legend_exp="" patch_size="-1,-1" source="Point?crs=EPSG:4326&amp;uid={98f1cf95-2d66-4e2b-ab42-5f814aa62a83}" checked="Qt::Checked" legend_split_behavior="0" providerKey="memory">
           <customproperties>
             <Option type="Map">
-              <Option type="QString" value="route_markers [57]" name="cached_name"/>
-              <Option name="expandedLegendNodes"/>
-              <Option type="int" value="1" name="showFeatureCount"/>
+              <Option name="showFeatureCount" value="1" type="int"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="all_routes" source="./all_routes.shp|layername=all_routes" patch_size="0,0">
+      <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="all_routes" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option type="int" value="0" name="showFeatureCount"/>
+            <Option name="cached_name" value="all_routes" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" value="0" type="int"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer expanded="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="timelapse" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " patch_size="0,0">
+    <layer-tree-layer name="timelapse" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" expanded="0" legend_exp="" 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' " checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="timelapse" name="cached_name"/>
+          <Option name="cached_name" value="timelapse" type="QString"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Feeding Stations">
+    <layer-tree-group name="Feeding Stations" expanded="1" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="1" id="water_tables20170921142016467" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="water_tables" source="./water_tables.shp" patch_size="0,0">
+      <layer-tree-layer name="water_tables" id="water_tables20170921142016467" expanded="1" legend_exp="" patch_size="0,0" source="./water_tables.shp" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="water_tables" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
+            <Option name="cached_name" value="water_tables" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Ask Me">
+    <layer-tree-group name="Ask Me" expanded="0" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="poi_labels" source="./poi_labels.shp|layername=poi_labels" patch_size="0,0">
+      <layer-tree-layer name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" legend_exp="" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="poi_labels" name="cached_name"/>
+            <Option name="cached_name" value="poi_labels" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start" patch_size="0,0">
+      <layer-tree-layer name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" legend_exp="" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="directions_to_start" name="cached_name"/>
+            <Option name="cached_name" value="directions_to_start" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Residents Access">
+    <layer-tree-group name="Residents Access" expanded="0" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="mayor" source="./mayor.shp" patch_size="0,0">
+      <layer-tree-layer name="mayor" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" expanded="1" legend_exp="" patch_size="0,0" source="./mayor.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="mayor" name="cached_name"/>
+            <Option name="cached_name" value="mayor" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="viplabels" source="./viplabels.shp" patch_size="0,0">
+      <layer-tree-layer name="viplabels" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" expanded="1" legend_exp="" patch_size="0,0" source="./viplabels.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="viplabels" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" value="viplabels" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="vipaccess" source="./vipaccess.shp" patch_size="0,0">
+      <layer-tree-layer name="vipaccess" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" expanded="1" legend_exp="" patch_size="0,0" source="./vipaccess.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="vipaccess" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" value="vipaccess" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="golfaccess" source="./golfaccess.shp" patch_size="0,0">
+      <layer-tree-layer name="golfaccess" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" expanded="0" legend_exp="" patch_size="0,0" source="./golfaccess.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads" patch_size="0,0">
+      <layer-tree-layer name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" legend_exp="" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="residents_access_roads" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" value="residents_access_roads" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="residents_access" source="./residents_access.shp|layername=residents_access" patch_size="0,0">
+      <layer-tree-layer name="residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" expanded="1" legend_exp="" patch_size="0,0" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="OSM data">
+    <layer-tree-group name="OSM data" expanded="1" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="osm_roads" source="./osm_roads.shp" patch_size="0,0">
+      <layer-tree-layer name="osm_roads" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" legend_exp="" patch_size="0,0" source="./osm_roads.shp" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="osm_roads [3887]" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option type="QString" value="1" name="showFeatureCount"/>
+            <Option name="cached_name" value="osm_roads [3887]" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="osm_places" source="./osm_places.shp|layername=osm_places" patch_size="0,0">
+      <layer-tree-layer name="osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" legend_exp="" patch_size="0,0" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="osm_places [7]" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option type="QString" value="1" name="showFeatureCount"/>
+            <Option name="cached_name" value="osm_places [7]" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Unchecked" groupLayer="" name="Start and Finish pages">
+    <layer-tree-group name="Start and Finish pages" expanded="1" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="data-comments" source="./data-comments.shp" patch_size="0,0">
+      <layer-tree-layer name="data-comments" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" expanded="1" legend_exp="" patch_size="0,0" source="./data-comments.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="data-comments" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" value="data-comments" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="start_finish_area" source="./start_finish_area.shp" patch_size="0,0">
+      <layer-tree-layer name="start_finish_area" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" expanded="1" legend_exp="" patch_size="0,0" source="./start_finish_area.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="start_finish_area" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" value="start_finish_area" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Elevation">
+    <layer-tree-group name="Elevation" expanded="0" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0" legend_exp="" name="capetownelevation-1m" source="./capetownelevation-1m.shp" patch_size="0,0">
+      <layer-tree-layer name="capetownelevation-1m" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" expanded="1" legend_exp="" patch_size="0,0" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="1" name="showFeatureCount"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Map">
+    <layer-tree-group name="Map" expanded="1" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="GDAL-City of Cape Town 2015 Aerial" source="./GDAL-City of Cape Town 2015 Aerial.xml" patch_size="0,0">
+      <layer-tree-layer name="GDAL-City of Cape Town 2015 Aerial" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" legend_exp="" patch_size="0,0" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="gdal">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="GDAL-City of Cape Town 2015 Aerial" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
+            <Option name="cached_name" value="GDAL-City of Cape Town 2015 Aerial" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="Outlines" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" patch_size="0,0">
+      <layer-tree-layer name="Outlines" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" legend_exp="" 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" checked="Qt::Checked" legend_split_behavior="0" providerKey="wms">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" value="Outlines" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
+            <Option name="cached_name" value="Outlines" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -314,46 +313,46 @@
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
       <item>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</item>
       <item>cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a</item>
-      <item>route_markers_21122a5c_9be9_458c_9d62_573685055e1c</item>
+      <item>route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings maxScale="0" tolerance="10" self-snapping="1" type="1" intersection-snapping="1" mode="3" minScale="0" unit="1" scaleDependencyMode="0" enabled="1">
+  <snapping-settings tolerance="10" scaleDependencyMode="0" mode="3" self-snapping="1" maxScale="0" type="1" enabled="0" intersection-snapping="1" unit="1" minScale="0">
     <individual-layer-settings>
-      <layer-setting maxScale="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" type="2" units="1" minScale="0" enabled="1"/>
-      <layer-setting maxScale="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" type="1" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="water_tables20170921142016467" tolerance="0" type="2" units="2" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" tolerance="12" type="0" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" tolerance="12" type="0" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" type="1" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" tolerance="12" type="0" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" type="1" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" type="1" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="extra_security20170921130834191" tolerance="0" type="2" units="2" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
-      <layer-setting maxScale="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" type="2" units="1" minScale="0" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="2" tolerance="0" id="extra_security20170921130834191" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" maxScale="0" type="1" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" maxScale="0" type="1" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" maxScale="0" type="1" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" maxScale="0" type="1" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" maxScale="0" type="0" enabled="0" minScale="0"/>
+      <layer-setting units="2" tolerance="0" id="water_tables20170921142016467" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" maxScale="0" type="1" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" maxScale="0" type="2" enabled="1" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" maxScale="0" type="2" enabled="0" minScale="0"/>
+      <layer-setting units="1" tolerance="12" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" maxScale="0" type="0" enabled="0" minScale="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
   <polymorphicRelations/>
-  <mapcanvas annotationsVisible="1" name="theMapCanvas">
+  <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.40646932918750522</xmin>
-      <ymin>-33.90381339025915253</ymin>
-      <xmax>18.414601992524954</xmax>
-      <ymax>-33.8995522642739715</ymax>
+      <xmin>18.39262360336048019</xmin>
+      <ymin>-33.91377785181562388</ymin>
+      <xmax>18.42086732654766834</xmax>
+      <ymax>-33.89897949390747556</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -374,166 +373,166 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="true" checked="Qt::Checked" name="Marshals">
-      <legendlayer open="true" checked="Qt::Checked" showFeatureCount="1" drawingOrder="-1" name="marshal_positions">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0" visible="1"/>
+    <legendgroup open="false" name="Marshals" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" open="true" name="marshal_positions" showFeatureCount="1" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="extra_security">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="extra_security20170921130834191" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="extra_security" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="1" drawingOrder="-1" name="marshals_by_position">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="marshals_by_position20161003112326575" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="marshals_by_position" showFeatureCount="1" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="complete_marshal_overview">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="complete_marshal_overview" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="marshal_overviews">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="false" name="marshal_overviews" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Unchecked" name="Fencing and Cones">
-      <legendlayer open="true" checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" name="fencing">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="0"/>
+    <legendgroup open="false" name="Fencing and Cones" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" open="true" name="fencing" showFeatureCount="0" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="cone_only_groups">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="cone_only_groups" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="fence_and_cone_groups">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="fence_and_cone_groups" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Routes">
-      <legendgroup open="true" checked="Qt::Checked" name="Markers">
-        <legendlayer open="true" checked="Qt::Checked" showFeatureCount="1" drawingOrder="-1" name="route_markers">
-          <filegroup hidden="false" open="true">
-            <legendlayerfile layerid="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" isInOverview="0" visible="1"/>
+    <legendgroup open="true" name="Routes" checked="Qt::Checked">
+      <legendgroup open="true" name="Markers" checked="Qt::Checked">
+        <legendlayer drawingOrder="-1" open="true" name="route_markers" showFeatureCount="1" checked="Qt::Checked">
+          <filegroup open="true" hidden="false">
+            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer open="true" checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" name="all_routes">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0" visible="1"/>
+      <legendlayer drawingOrder="-1" open="true" name="all_routes" showFeatureCount="0" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer open="false" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="timelapse">
-      <filegroup hidden="false" open="false">
-        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0" visible="0"/>
+    <legendlayer drawingOrder="-1" open="false" name="timelapse" showFeatureCount="0" checked="Qt::Unchecked">
+      <filegroup open="false" hidden="false">
+        <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" checked="Qt::Checked" name="Feeding Stations">
-      <legendlayer open="true" checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" name="water_tables">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="1"/>
+    <legendgroup open="true" name="Feeding Stations" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" open="true" name="water_tables" showFeatureCount="0" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Ask Me">
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="poi_labels">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0" visible="0"/>
+    <legendgroup open="false" name="Ask Me" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" open="true" name="poi_labels" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="directions_to_start">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="directions_to_start" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Residents Access">
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="mayor">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0" visible="0"/>
+    <legendgroup open="false" name="Residents Access" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" open="true" name="mayor" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="viplabels">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="viplabels" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="vipaccess">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="vipaccess" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="golfaccess">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="false" name="golfaccess" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="residents_access_roads">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="residents_access_roads" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="residents_access">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="residents_access" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="OSM data">
-      <legendlayer open="false" checked="Qt::Checked" showFeatureCount="1" drawingOrder="-1" name="osm_roads">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0" visible="1"/>
+    <legendgroup open="true" name="OSM data" checked="Qt::Checked">
+      <legendlayer drawingOrder="-1" open="false" name="osm_roads" showFeatureCount="1" checked="Qt::Checked">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Checked" showFeatureCount="1" drawingOrder="-1" name="osm_places">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0" visible="1"/>
+      <legendlayer drawingOrder="-1" open="true" name="osm_places" showFeatureCount="1" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Unchecked" name="Start and Finish pages">
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="data-comments">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0" visible="0"/>
+    <legendgroup open="true" name="Start and Finish pages" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" open="true" name="data-comments" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="0" drawingOrder="-1" name="start_finish_area">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0" visible="0"/>
+      <legendlayer drawingOrder="-1" open="true" name="start_finish_area" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Elevation">
-      <legendlayer open="true" checked="Qt::Unchecked" showFeatureCount="1" drawingOrder="-1" name="capetownelevation-1m">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0" visible="0"/>
+    <legendgroup open="false" name="Elevation" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" open="true" name="capetownelevation-1m" showFeatureCount="1" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Map">
-      <legendlayer open="false" checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="1"/>
+    <legendgroup open="true" name="Map" checked="Qt::Checked">
+      <legendlayer drawingOrder="-1" open="false" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" checked="Qt::Unchecked">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" name="Outlines">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0" visible="1"/>
+      <legendlayer drawingOrder="-1" open="true" name="Outlines" showFeatureCount="0" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer legendPlaceholderImage="" autoRefreshTime="0" type="annotation" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="">
+  <main-annotation-layer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="annotation" autoRefreshTime="0" refreshOnNotifyMessage="" minScale="0">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -561,6 +560,7 @@
       <title></title>
       <abstract></abstract>
       <links/>
+      <dates/>
       <fees></fees>
       <encoding></encoding>
       <crs>
@@ -579,12 +579,21 @@
       <extent/>
     </resourceMetadata>
     <items/>
+    <flags>
+      <Identifiable>1</Identifiable>
+      <Removable>1</Removable>
+      <Searchable>1</Searchable>
+      <Private>0</Private>
+    </flags>
+    <customproperties>
+      <Option/>
+    </customproperties>
     <layerOpacity>1</layerOpacity>
     <blendMode>0</blendMode>
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" type="raster" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" minScale="1e+08" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="">
+    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="raster" autoRefreshTime="0" refreshOnNotifyMessage="" minScale="1e+08">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -633,6 +642,7 @@
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -649,7 +659,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -660,9 +670,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
-        <noDataList useSrcNoData="0" bandNo="2"/>
-        <noDataList useSrcNoData="0" bandNo="3"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList bandNo="2" useSrcNoData="0"/>
+        <noDataList bandNo="3" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -680,129 +690,91 @@
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" zoffset="0" band="1" zscale="1" enabled="0">
+      <elevation band="1" zoffset="0" symbology="Line" enabled="0" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="152,125,183,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="152,125,183,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="152,125,183,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{31a148a7-0364-430a-b534-21f418a5bb1b}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="152,125,183,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="152,125,183,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="152,125,183,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -811,27 +783,28 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="no_action" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="false" name="WMSBackgroundLayer"/>
-          <Option type="QString" value="false" name="WMSPublishDataSourceUrl"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="QString" value="Value" name="identify/format"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="WMSBackgroundLayer" value="false" type="QString"/>
+          <Option name="WMSPublishDataSourceUrl" value="false" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="identify/format" value="Value" type="QString"/>
         </Option>
       </customproperties>
+      <mapTip></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option type="QString" value="" name="name"/>
+          <Option name="name" value="" type="QString"/>
           <Option name="properties"/>
-          <Option type="QString" value="collection" name="type"/>
+          <Option name="type" value="collection" type="QString"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer redBand="1" opacity="0.5" type="multibandcolor" nodataColor="" greenBand="2" blueBand="3" alphaBand="-1">
+        <rasterrenderer opacity="0.5" alphaBand="-1" blueBand="3" redBand="1" greenBand="2" type="multibandcolor" nodataColor="">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -842,14 +815,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
-        <huesaturation saturation="0" invertColors="0" colorizeOn="0" colorizeGreen="128" colorizeBlue="128" grayscaleMode="0" colorizeStrength="100" colorizeRed="255"/>
+        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
+        <huesaturation saturation="0" grayscaleMode="0" colorizeStrength="100" invertColors="0" colorizeGreen="128" colorizeBlue="128" colorizeRed="255" colorizeOn="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" type="raster" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" minScale="1e+08" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="">
+    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="raster" autoRefreshTime="0" refreshOnNotifyMessage="" minScale="1e+08">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -898,6 +871,7 @@
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -914,7 +888,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -925,7 +899,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -943,129 +917,91 @@
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" zoffset="0" band="1" zscale="1" enabled="0">
+      <elevation band="1" zoffset="0" symbology="Line" enabled="0" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="225,89,137,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="225,89,137,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="225,89,137,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="225,89,137,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="225,89,137,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="225,89,137,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1074,27 +1010,28 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="no_action" name="QFieldSync/action"/>
-          <Option type="QString" value="no_action" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="true" name="WMSBackgroundLayer"/>
-          <Option type="QString" value="false" name="WMSPublishDataSourceUrl"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="QString" value="Undefined" name="identify/format"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="WMSBackgroundLayer" value="true" type="QString"/>
+          <Option name="WMSPublishDataSourceUrl" value="false" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="identify/format" value="Undefined" type="QString"/>
         </Option>
       </customproperties>
+      <mapTip></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option type="QString" value="" name="name"/>
+          <Option name="name" value="" type="QString"/>
           <Option name="properties"/>
-          <Option type="QString" value="collection" name="type"/>
+          <Option name="type" value="collection" type="QString"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer opacity="0.75" band="1" type="singlebandcolordata" nodataColor="" alphaBand="-1">
+        <rasterrenderer band="1" opacity="0.75" alphaBand="-1" type="singlebandcolordata" nodataColor="">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1105,14 +1042,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
-        <huesaturation saturation="0" invertColors="0" colorizeOn="0" colorizeGreen="128" colorizeBlue="128" grayscaleMode="0" colorizeStrength="100" colorizeRed="255"/>
+        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
+        <huesaturation saturation="0" grayscaleMode="0" colorizeStrength="100" invertColors="0" colorizeGreen="128" colorizeBlue="128" colorizeRed="255" colorizeOn="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1161,23 +1098,24 @@
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1191,8 +1129,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="$length * 100" precision="0" name="length_km"/>
-        <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="$length * 100 * 1000" precision="0" name="length_m"/>
+        <field name="length_km" expression="$length * 100" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="length_m" expression="$length * 100 * 1000" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1205,360 +1143,264 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="RouteLen" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="RouteLen" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{14a5ec6d-a9d2-4221-909d-48fa947966db}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="229,182,54,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="229,182,54,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="229,182,54,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="229,182,54,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="164,130,39,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="229,182,54,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="164,130,39,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="229,182,54,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="164,130,39,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{2821b303-e942-4f2b-95eb-71ba37854d84}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="229,182,54,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="164,130,39,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="229,182,54,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="164,130,39,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="229,182,54,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="164,130,39,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" description="Only show when active in Atlas" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" label="Show by day">
-            <rule symbol="1" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" label="21KM"/>
-            <rule symbol="2" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" label="10KM"/>
-            <rule symbol="3" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '5KM'" key="{871a9276-8278-4528-911c-7e434c0885d3}" label="5KM"/>
-            <rule symbol="4" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" label="Trail"/>
+          <rule description="Only show when active in Atlas" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" symbol="0" label="Show by day">
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="1" label="21KM" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="2" label="10KM" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '5KM'" key="{871a9276-8278-4528-911c-7e434c0885d3}" symbol="3" label="5KM" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" symbol="4" label="Trail" checkstate="0"/>
           </rule>
-          <rule symbol="5" checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" label="Always show"/>
-          <rule symbol="6" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" label="Always show by day"/>
+          <rule key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" symbol="5" label="Always show" checkstate="0"/>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" symbol="6" label="Always show by day" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="500" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="250" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@0@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{c07399ea-beb4-4328-8240-a80a1288dc13}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="0,0,0,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MapUnit" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@0@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@0@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{375106d8-ffb9-4433-8f42-bd7727c23e58}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="0,0,0,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="0,0,0,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option 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" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1566,444 +1408,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.5" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN 'dash'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN 'dash'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{1c6ea3ad-b426-4646-b786-88c35d759f75}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@0@2" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@0@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{f29062d5-8f7a-49df-a456-af79ffadebeb}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="0,0,0,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="true" name="active"/>
-                          <Option 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" name="expression"/>
-                          <Option type="int" value="3" name="type"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                          <Option name="type" value="3" type="int"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="FirstVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="FirstVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@0@3" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@0@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{3d683642-1e02-4313-ae66-4b398724d7bc}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="0,0,0,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="true" name="active"/>
-                          <Option 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" name="expression"/>
-                          <Option type="int" value="3" name="type"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                          <Option name="type" value="3" type="int"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="1" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{d9268524-45f1-4731-945d-c43780c8de62}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="500" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="250" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@1@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="210,32,39,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MapUnit" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="1" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="1" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="1" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@1@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@1@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="210,32,39,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="210,32,39,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="210,32,39,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2011,444 +1717,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="210,32,39,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.25" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="210,32,39,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.25" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="210,32,39,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.25" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{903df944-a62b-4e12-b3c3-dd56eb016c50}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@1@2" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@1@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="210,32,39,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="FirstVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="FirstVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@1@3" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@1@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{64671b77-2f8b-408e-a6d3-7d9156b47449}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="210,32,39,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="2" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="500" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="250" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@2@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@2@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="103,34,144,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MapUnit" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@2@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@2@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="103,34,144,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2456,444 +2026,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="103,34,144,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.5" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@2@2" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@2@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{3be01cea-3561-46b3-874e-2f8b60b1d683}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="103,34,144,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{88220b0d-a48b-45b5-aad8-3b42c6069888}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="FirstVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="FirstVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@2@3" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@2@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="103,34,144,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="3" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="3" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="500" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="250" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@3@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@3@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="145,211,55,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MapUnit" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@3@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@3@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="145,211,55,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="145,211,55,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="145,211,55,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2901,444 +2335,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="145,211,55,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.5" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="145,211,55,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="145,211,55,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{09613930-5415-4f16-9126-06282c6e8ebe}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@3@2" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@3@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="145,211,55,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="FirstVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="FirstVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@3@3" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@3@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="145,211,55,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="145,211,55,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="4" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="4" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="500" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="250" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="250" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@4@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@4@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="0,72,255,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MapUnit" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="0,72,255,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@4@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@4@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="0,72,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,72,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="227,26,28,0" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="0,72,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3346,453 +2644,302 @@
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,72,255,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.5" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,72,255,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.5" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,72,255,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{536a9089-88ae-403e-a80e-164ca63e1aee}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@4@2" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@4@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{8f58777c-0c60-41db-9b75-06624dc32b3c}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="0,72,255,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="0,72,255,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="FirstVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="FirstVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="FirstVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@4@3" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@4@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="0,72,255,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,72,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="0,72,255,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="5" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="5" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.26" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="6" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="6" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.46" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.46" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3803,199 +2950,335 @@
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{fd09a5be-3328-4f5f-a802-aaa9365e22cb}">
-          <rule description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" key="{83b529c4-ab23-4e8f-8099-3d7728e2b8fa}">
+        <rules key="{1e5906eb-3293-40e6-9693-aecca72e6ace}">
+          <rule description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{e8bc2eb1-ef27-4acd-94dc-f5f5984aa9dc}" active="0">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="255,255,255,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="round($length / 1000, 0)" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round($length / 1000, 0)" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="1" shapeOffsetY="0" shapeSizeX="1">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="164,113,88,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="164,113,88,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="164,113,88,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="0,0,0,255" name="color"/>
-                        <Option type="QString" value="round" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="1" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="0,0,0,255" k="color"/>
-                      <prop v="round" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="1" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option 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" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option 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" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="km_marker()" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="LineGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="1" quadOffset="3" placement="0" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="1" polygonPlacementFlags="2" geometryGenerator="km_marker()" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="quadrant" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="quadrant" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="field" value="rotation" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <rule description="Route lengths" key="{42dd1aec-3e48-4dbd-b22f-b4960bd4f8d2}" active="0">
+            <settings calloutType="simple">
+              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100, 4 )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+                <families/>
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                      <Option type="Map">
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="164,113,88,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties"/>
+                          <Option name="type" value="collection" type="QString"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                      <Option type="Map">
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
+                            </Option>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
+                            </Option>
+                          </Option>
+                          <Option name="type" value="collection" type="QString"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties"/>
+                    <Option name="type" value="collection" type="QString"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="km_marker()" overlapHandling="AllowOverlapAtNoCost" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="50" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
+                    </Option>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
+                    </Option>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="quadrant" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
+                    </Option>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="field" value="rotation" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
+                    </Option>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
+                    </Option>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
+                    </Option>
+                  </Option>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties"/>
+                    <Option name="type" value="collection" type="QString"/>
+                  </Option>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -4004,101 +3287,75 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="100000" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{99bd229d-7319-436f-b616-1be11812c381}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -4106,16 +3363,16 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="2" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4126,8 +3383,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4136,8 +3393,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4146,8 +3403,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4156,8 +3413,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4166,8 +3423,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4176,8 +3433,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4186,8 +3443,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4196,8 +3453,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4220,8 +3477,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4230,8 +3487,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -4251,70 +3508,84 @@
         <alias field="length_km" index="10" name=""/>
         <alias field="length_m" index="11" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="Name"/>
+        <policy policy="Duplicate" field="descriptio"/>
+        <policy policy="Duplicate" field="timestamp"/>
+        <policy policy="Duplicate" field="begin"/>
+        <policy policy="Duplicate" field="end"/>
+        <policy policy="Duplicate" field="Distance"/>
+        <policy policy="Duplicate" field="RouteLen"/>
+        <policy policy="Duplicate" field="Source"/>
+        <policy policy="Duplicate" field="Sort"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="length_km"/>
+        <policy policy="Duplicate" field="length_m"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="Sort"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="Name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="descriptio" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="timestamp" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="begin" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="end" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Distance" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="RouteLen" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Source" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Sort" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="length_km" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="length_m" exp_strength="0"/>
+        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Sort" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="Sort"/>
-        <constraint desc="" exp="" field="day"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="length_m"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="Sort" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="$length * 100" precision="0" name="length_km"/>
-        <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="$length * 100 * 1000" precision="0" name="length_m"/>
+        <field name="length_km" expression="$length * 100" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="length_m" expression="$length * 100 * 1000" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;length_m&quot;" sortOrder="1">
+      <attributetableconfig sortExpression="&quot;length_m&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="152" name="Name"/>
-          <column hidden="0" type="field" width="-1" name="descriptio"/>
-          <column hidden="0" type="field" width="-1" name="timestamp"/>
-          <column hidden="0" type="field" width="163" name="begin"/>
-          <column hidden="0" type="field" width="-1" name="end"/>
-          <column hidden="0" type="field" width="-1" name="Distance"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="RouteLen"/>
-          <column hidden="0" type="field" width="-1" name="Source"/>
-          <column hidden="0" type="field" width="188" name="length_m"/>
-          <column hidden="0" type="field" width="-1" name="Sort"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
-          <column hidden="0" type="field" width="266" name="length_km"/>
+          <column name="Name" width="152" type="field" hidden="0"/>
+          <column name="descriptio" width="-1" type="field" hidden="0"/>
+          <column name="timestamp" width="-1" type="field" hidden="0"/>
+          <column name="begin" width="163" type="field" hidden="0"/>
+          <column name="end" width="-1" type="field" hidden="0"/>
+          <column name="Distance" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="RouteLen" width="-1" type="field" hidden="0"/>
+          <column name="Source" width="-1" type="field" hidden="0"/>
+          <column name="length_m" width="188" type="field" hidden="0"/>
+          <column name="Sort" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="length_km" width="266" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4346,53 +3617,53 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Sort"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="0" name="length_km"/>
-        <field editable="0" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="0"/>
+        <field name="length_m" editable="0"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Sort"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Sort" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="Distance"/>
-        <field reuseLastValue="0" name="Name"/>
-        <field reuseLastValue="0" name="RouteLen"/>
-        <field reuseLastValue="0" name="Sort"/>
-        <field reuseLastValue="0" name="Source"/>
-        <field reuseLastValue="0" name="begin"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="descriptio"/>
-        <field reuseLastValue="0" name="end"/>
-        <field reuseLastValue="0" name="length_km"/>
-        <field reuseLastValue="0" name="length_m"/>
-        <field reuseLastValue="0" name="timestamp"/>
+        <field name="Distance" reuseLastValue="0"/>
+        <field name="Name" reuseLastValue="0"/>
+        <field name="RouteLen" reuseLastValue="0"/>
+        <field name="Sort" reuseLastValue="0"/>
+        <field name="Source" reuseLastValue="0"/>
+        <field name="begin" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="descriptio" reuseLastValue="0"/>
+        <field name="end" reuseLastValue="0"/>
+        <field name="length_km" reuseLastValue="0"/>
+        <field name="length_m" reuseLastValue="0"/>
+        <field name="timestamp" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -4432,18 +3703,19 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
@@ -4465,273 +3737,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="196,60,57,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="196,60,57,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="196,60,57,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="196,60,57,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="140,43,41,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="196,60,57,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="140,43,41,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="196,60,57,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="140,43,41,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{53b6bbaf-4722-434f-a142-936b95477967}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="196,60,57,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="140,43,41,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="196,60,57,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="140,43,41,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="196,60,57,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="140,43,41,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="183,72,75,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.26" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="183,72,75,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="183,72,75,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4742,15 +3930,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4784,26 +3972,31 @@ def my_form_open(dialog, layer, feature):
         <alias field="height" index="1" name=""/>
         <alias field="elevation" index="2" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="ID"/>
+        <policy policy="Duplicate" field="height"/>
+        <policy policy="Duplicate" field="elevation"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="ID"/>
-        <default applyOnUpdate="0" expression="" field="height"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="ID" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="height" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="elevation" exp_strength="0"/>
+        <constraint unique_strength="0" field="ID" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="height" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="elevation" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="ID"/>
-        <constraint desc="" exp="" field="height"/>
-        <constraint desc="" exp="" field="elevation"/>
+        <constraint field="ID" exp="" desc=""/>
+        <constraint field="height" exp="" desc=""/>
+        <constraint field="elevation" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4826,7 +4019,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="Polygon" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" styleCategories="AllStyleCategories">
+    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Polygon" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -4866,6 +4059,7 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -4901,241 +4095,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="133,182,111,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="133,182,111,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="133,182,111,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="133,182,111,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="95,130,79,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="133,182,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="95,130,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="133,182,111,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="95,130,79,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{1880865e-e5e1-4936-8c97-9d2a6866e812}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="133,182,111,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="95,130,79,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="133,182,111,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="95,130,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="133,182,111,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="95,130,79,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="225,89,137,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="225,89,137,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="225,89,137,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5146,17 +4272,17 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="no_action" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
         </Option>
       </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=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -5198,29 +4324,35 @@ def my_form_open(dialog, layer, feature):
         <alias field="page" index="2" name=""/>
         <alias field="day" index="3" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="page"/>
+        <policy policy="Duplicate" field="day"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="page"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="page" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="page" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="page"/>
-        <constraint desc="" exp="" field="day"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="page" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -5243,7 +4375,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="Polygon" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" styleCategories="AllStyleCategories">
+    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Polygon" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -5283,6 +4415,7 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -5318,241 +4451,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="243,166,178,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="243,166,178,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="243,166,178,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{9fd55fce-62b5-4989-a948-622d8a60e362}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="243,166,178,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="174,119,127,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="243,166,178,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="174,119,127,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="243,166,178,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="174,119,127,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="243,166,178,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="174,119,127,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="243,166,178,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="174,119,127,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="243,166,178,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="174,119,127,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="114,155,111,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="38,162,105,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="f_diagonal" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="114,155,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="38,162,105,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="f_diagonal" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="114,155,111,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="38,162,105,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="f_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5563,92 +4628,65 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="&quot;name&quot;"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="&quot;name&quot;" type="QString"/>
           </Option>
-          <Option type="int" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="int"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="0" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="5" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="1" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" bold="0" italic="0" style="0" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="5" enabled="0" showAxis="1" opacity="1" penWidth="0" penColor="#000000" direction="0" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" italic="0" underline="0" style="0" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5656,22 +4694,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="1" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="1" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </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" value="0" name="allowedGapsBuffer"/>
-            <Option type="bool" value="false" name="allowedGapsEnabled"/>
-            <Option type="QString" value="" name="allowedGapsLayer"/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -5721,39 +4759,46 @@ def my_form_open(dialog, layer, feature):
         <alias field="day" index="3" name=""/>
         <alias field="cone_len" index="4" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="name"/>
+        <policy policy="Duplicate" field="group"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="cone_len"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="group" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="cone_len" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="group"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="day"/>
-        <constraint desc="" exp="" field="cone_len"/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="group" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
+        <constraint field="cone_len" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="306" name="name"/>
-          <column hidden="0" type="field" width="-1" name="group"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
-          <column hidden="0" type="field" width="-1" name="cone_len"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column name="name" width="306" type="field" hidden="0"/>
+          <column name="group" width="-1" type="field" hidden="0"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="cone_len" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5785,32 +4830,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="cone_len"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="cone_len" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -5859,23 +4904,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5900,273 +4946,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="190,178,151,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="190,178,151,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="190,178,151,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="190,178,151,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="136,127,108,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="190,178,151,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,127,108,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="190,178,151,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="136,127,108,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="190,178,151,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="136,127,108,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="190,178,151,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,127,108,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="190,178,151,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="136,127,108,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,85,255,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="1" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,85,255,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,85,255,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6177,189 +5139,151 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="Name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="Name" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-          <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MM" priority="5" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="LineGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="2" offsetType="0" centroidWhole="0" allowDegraded="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2"/>
-          <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="LineGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+          <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-              <Option type="int" value="0" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-              <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-              <Option type="double" value="0" name="minLength"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-              <Option type="QString" value="MM" name="minLengthUnit"/>
-              <Option type="double" value="0" name="offsetFromAnchor"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-              <Option type="double" value="0" name="offsetFromLabel"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="Name" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="Name" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6367,16 +5291,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6402,27 +5326,31 @@ def my_form_open(dialog, layer, feature):
         <alias field="id" index="0" name=""/>
         <alias field="Name" index="1" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="Name"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="Name" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Name" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="Name"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="Name" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="Name"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="Name" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6454,12 +5382,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="id"/>
+        <field name="Name" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="id"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -6467,7 +5395,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -6516,23 +5444,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6557,450 +5486,319 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{648e55d2-e73b-45b7-bf24-689efea25f17}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="145,82,45,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="145,82,45,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="145,82,45,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="145,82,45,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="104,59,32,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="145,82,45,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="104,59,32,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="145,82,45,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="104,59,32,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{f8afb303-1e69-416a-9c9b-55ed02b33766}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="145,82,45,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="104,59,32,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="145,82,45,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="104,59,32,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="145,82,45,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="104,59,32,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" description="Only show when active in Atlas" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" label="21KM"/>
-          <rule symbol="1" description="Only show when active in Atlas" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" label="10KM"/>
-          <rule symbol="2" description="Only show when active in Atlas" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" label="5KM"/>
+          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" symbol="0" label="21KM"/>
+          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" symbol="1" label="10KM"/>
+          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" symbol="2" label="5KM"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@0@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{a6a584bd-d0ac-4682-949e-960321bee388}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="210,32,39,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="miter" name="joinstyle"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="210,32,39,255" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0.5" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="area" name="scale_method"/>
-                    <Option type="QString" value="3" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="miter" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="210,32,39,255" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0.5" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="area" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="miter" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="210,32,39,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0.5" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="250" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="100" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="100" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@0@1" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@0@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="210,32,39,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MapUnit" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="3" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="210,32,39,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@0@1@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@0@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{2967078f-5e58-40bd-b0c8-aabffd928676}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="210,32,39,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
-                        <Option type="QString" value="no" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="210,32,39,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="26,0,201,0" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="210,32,39,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -7008,213 +5806,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="flat" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="210,32,39,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.75" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="210,32,39,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="210,32,39,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="1" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{eab0a889-d082-476e-b081-a39cd87a440e}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="500" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@1@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{8af4d1dd-523c-4887-a603-8238496f1e2c}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="103,34,144,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="3" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@1@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@1@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{c53a1ec5-544c-48d2-961a-03466d491afc}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="103,34,144,255" name="color"/>
-                        <Option type="QString" value="miter" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="103,34,144,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.5" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="miter" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="103,34,144,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.5" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="103,34,144,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.5" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -7222,139 +5954,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="250" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="100" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="100" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@1@1" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="103,34,144,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="3" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@1@1@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{43e5e783-9402-4471-b264-9b43c9035744}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="103,34,144,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
-                        <Option type="QString" value="no" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="26,0,201,0" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -7362,213 +6055,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{9ffea0b4-4940-4dcf-9553-865b28a97639}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="flat" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="103,34,144,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.75" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="2" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="500" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="500" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@2@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@2@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="69,100,25,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MapUnit" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="3" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="69,100,25,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="69,100,25,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@2@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@2@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="69,100,25,255" name="color"/>
-                        <Option type="QString" value="miter" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="69,100,25,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.5" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="69,100,25,255" type="QString"/>
+                        <Option name="joinstyle" value="miter" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="69,100,25,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.5" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="69,100,25,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="69,100,25,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.5" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -7576,139 +6203,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{579d1121-5712-48ef-b839-b461ebde82d6}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="250" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="100" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="100" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@2@1" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@2@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="69,100,25,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MapUnit" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="3" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="69,100,25,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MapUnit" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="69,100,25,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@2@1@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@2@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="69,100,25,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
-                        <Option type="QString" value="no" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="69,100,25,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="26,0,201,0" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="69,100,25,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -7716,68 +6304,41 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="flat" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="69,100,25,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.75" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MapUnit" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="69,100,25,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MapUnit" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="69,100,25,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7789,93 +6350,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="100000" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7883,16 +6417,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="2" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7910,8 +6444,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -7921,27 +6455,31 @@ def my_form_open(dialog, layer, feature):
         <alias field="id" index="0" name=""/>
         <alias field="Distance" index="1" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="Distance"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Distance" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="Distance"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="Distance"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="id"/>
+          <column name="Distance" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7973,30 +6511,30 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -8004,7 +6542,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="Point" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" refreshOnNotifyMessage="" geometry="Point" styleCategories="AllStyleCategories">
+    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -8044,18 +6582,19 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
@@ -8077,263 +6616,187 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="125,139,143,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="125,139,143,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="125,139,143,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="125,139,143,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="89,99,102,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="89,99,102,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="125,139,143,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="89,99,102,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="125,139,143,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="89,99,102,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="89,99,102,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="125,139,143,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="89,99,102,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="0.796078">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="marker" alpha="0.796078" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="227,0,185,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="circle" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,0,0,0" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="1" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="227,0,185,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,0" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="1" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="227,0,185,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,0" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8346,288 +6809,266 @@ def my_form_open(dialog, layer, feature):
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
           <rule description="Show in marshal maps" filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="8" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="8" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeOffsetY="0" shapeSizeX="0.20000000000000001">
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.20000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.4" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.4" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.4" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="FontStyle">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="ObstacleFactor">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="ObstacleFactor" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="Priority">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="Priority" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="ZIndex">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="ZIndex" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="8" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="1" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="8" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="1" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="227,0,185,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" fontWordSpacing="0" textOrientation="horizontal" fontSize="4" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="4" textOrientation="horizontal" fontKerning="1" textColor="227,0,185,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.5" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeOffsetY="0" shapeSizeX="0">
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.1" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.1" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="FontStyle">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="0" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="2" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="2" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -8636,227 +7077,200 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="QString" value="false" name="labeling/addDirectionSymbol"/>
-          <Option type="QString" value="0" name="labeling/angleOffset"/>
-          <Option type="QString" value="0" name="labeling/blendMode"/>
-          <Option type="QString" value="0" name="labeling/bufferBlendMode"/>
-          <Option type="QString" value="255" name="labeling/bufferColorA"/>
-          <Option type="QString" value="255" name="labeling/bufferColorB"/>
-          <Option type="QString" value="255" name="labeling/bufferColorG"/>
-          <Option type="QString" value="255" name="labeling/bufferColorR"/>
-          <Option type="QString" value="false" name="labeling/bufferDraw"/>
-          <Option type="QString" value="64" name="labeling/bufferJoinStyle"/>
-          <Option type="QString" value="false" name="labeling/bufferNoFill"/>
-          <Option type="QString" value="1" name="labeling/bufferSize"/>
-          <Option type="QString" value="false" name="labeling/bufferSizeInMapUnits"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale"/>
-          <Option type="QString" value="0" name="labeling/bufferTransp"/>
-          <Option type="QString" value="false" name="labeling/centroidInside"/>
-          <Option type="QString" value="false" name="labeling/centroidWhole"/>
-          <Option type="QString" value="3" name="labeling/decimals"/>
-          <Option type="QString" value="false" name="labeling/displayAll"/>
-          <Option type="QString" value="0" name="labeling/dist"/>
-          <Option type="QString" value="false" name="labeling/distInMapUnits"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/distMapUnitScale"/>
-          <Option type="QString" value="false" name="labeling/drawLabels"/>
-          <Option type="QString" value="false" name="labeling/enabled"/>
-          <Option type="QString" value="position" name="labeling/fieldName"/>
-          <Option type="QString" value="false" name="labeling/fitInPolygonOnly"/>
-          <Option type="QString" value="0" name="labeling/fontCapitals"/>
-          <Option type="QString" value="Myriad Pro" name="labeling/fontFamily"/>
-          <Option type="QString" value="false" name="labeling/fontItalic"/>
-          <Option type="QString" value="0" name="labeling/fontLetterSpacing"/>
-          <Option type="QString" value="false" name="labeling/fontLimitPixelSize"/>
-          <Option type="QString" value="10000" name="labeling/fontMaxPixelSize"/>
-          <Option type="QString" value="3" name="labeling/fontMinPixelSize"/>
-          <Option type="QString" value="10" name="labeling/fontSize"/>
-          <Option type="QString" value="false" name="labeling/fontSizeInMapUnits"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale"/>
-          <Option type="QString" value="false" name="labeling/fontStrikeout"/>
-          <Option type="QString" value="false" name="labeling/fontUnderline"/>
-          <Option type="QString" value="63" name="labeling/fontWeight"/>
-          <Option type="QString" value="0" name="labeling/fontWordSpacing"/>
-          <Option type="QString" value="false" name="labeling/formatNumbers"/>
-          <Option type="QString" value="false" name="labeling/isExpression"/>
-          <Option type="QString" value="true" name="labeling/labelOffsetInMapUnits"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale"/>
-          <Option type="QString" value="false" name="labeling/labelPerPart"/>
-          <Option type="QString" value="&lt;" name="labeling/leftDirectionSymbol"/>
-          <Option type="QString" value="false" name="labeling/limitNumLabels"/>
-          <Option type="QString" value="20" name="labeling/maxCurvedCharAngleIn"/>
-          <Option type="QString" value="-20" name="labeling/maxCurvedCharAngleOut"/>
-          <Option type="QString" value="2000" name="labeling/maxNumLabels"/>
-          <Option type="QString" value="false" name="labeling/mergeLines"/>
-          <Option type="QString" value="0" name="labeling/minFeatureSize"/>
-          <Option type="QString" value="0" name="labeling/multilineAlign"/>
-          <Option type="QString" value="1" name="labeling/multilineHeight"/>
-          <Option type="QString" value="Semibold" name="labeling/namedStyle"/>
-          <Option type="QString" value="true" name="labeling/obstacle"/>
-          <Option type="QString" value="1" name="labeling/obstacleFactor"/>
-          <Option type="QString" value="0" name="labeling/obstacleType"/>
-          <Option type="QString" value="0" name="labeling/offsetType"/>
-          <Option type="QString" value="0" name="labeling/placeDirectionSymbol"/>
-          <Option type="QString" value="0" name="labeling/placement"/>
-          <Option type="QString" value="10" name="labeling/placementFlags"/>
-          <Option type="QString" value="false" name="labeling/plussign"/>
-          <Option type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder"/>
-          <Option type="QString" value="true" name="labeling/preserveRotation"/>
-          <Option type="QString" value="#ffffff" name="labeling/previewBkgrdColor"/>
-          <Option type="QString" value="5" name="labeling/priority"/>
-          <Option type="QString" value="4" name="labeling/quadOffset"/>
-          <Option type="QString" value="0" name="labeling/repeatDistance"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/repeatDistanceUnit"/>
-          <Option type="QString" value="false" name="labeling/reverseDirectionSymbol"/>
-          <Option type="QString" value=">" name="labeling/rightDirectionSymbol"/>
-          <Option type="QString" value="10000000" name="labeling/scaleMax"/>
-          <Option type="QString" value="1" name="labeling/scaleMin"/>
-          <Option type="QString" value="false" name="labeling/scaleVisibility"/>
-          <Option type="QString" value="6" name="labeling/shadowBlendMode"/>
-          <Option type="QString" value="0" name="labeling/shadowColorB"/>
-          <Option type="QString" value="0" name="labeling/shadowColorG"/>
-          <Option type="QString" value="0" name="labeling/shadowColorR"/>
-          <Option type="QString" value="false" name="labeling/shadowDraw"/>
-          <Option type="QString" value="135" name="labeling/shadowOffsetAngle"/>
-          <Option type="QString" value="1" name="labeling/shadowOffsetDist"/>
-          <Option type="QString" value="true" name="labeling/shadowOffsetGlobal"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shadowOffsetUnits"/>
-          <Option type="QString" value="1.5" name="labeling/shadowRadius"/>
-          <Option type="QString" value="false" name="labeling/shadowRadiusAlphaOnly"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shadowRadiusUnits"/>
-          <Option type="QString" value="100" name="labeling/shadowScale"/>
-          <Option type="QString" value="30" name="labeling/shadowTransparency"/>
-          <Option type="QString" value="0" name="labeling/shadowUnder"/>
-          <Option type="QString" value="0" name="labeling/shapeBlendMode"/>
-          <Option type="QString" value="255" name="labeling/shapeBorderColorA"/>
-          <Option type="QString" value="128" name="labeling/shapeBorderColorB"/>
-          <Option type="QString" value="128" name="labeling/shapeBorderColorG"/>
-          <Option type="QString" value="128" name="labeling/shapeBorderColorR"/>
-          <Option type="QString" value="0" name="labeling/shapeBorderWidth"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shapeBorderWidthUnits"/>
-          <Option type="QString" value="true" name="labeling/shapeDraw"/>
-          <Option type="QString" value="255" name="labeling/shapeFillColorA"/>
-          <Option type="QString" value="138" name="labeling/shapeFillColorB"/>
-          <Option type="QString" value="0" name="labeling/shapeFillColorG"/>
-          <Option type="QString" value="101" name="labeling/shapeFillColorR"/>
-          <Option type="QString" value="64" name="labeling/shapeJoinStyle"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shapeOffsetUnits"/>
-          <Option type="QString" value="0" name="labeling/shapeOffsetX"/>
-          <Option type="QString" value="0" name="labeling/shapeOffsetY"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shapeRadiiUnits"/>
-          <Option type="QString" value="0" name="labeling/shapeRadiiX"/>
-          <Option type="QString" value="0" name="labeling/shapeRadiiY"/>
-          <Option type="QString" value="0" name="labeling/shapeRotation"/>
-          <Option type="QString" value="0" name="labeling/shapeRotationType"/>
-          <Option type="QString" value="" name="labeling/shapeSVGFile"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale"/>
-          <Option type="QString" value="0" name="labeling/shapeSizeType"/>
-          <Option type="QString" value="1" name="labeling/shapeSizeUnits"/>
-          <Option type="QString" value="0" name="labeling/shapeSizeX"/>
-          <Option type="QString" value="0" name="labeling/shapeSizeY"/>
-          <Option type="QString" value="0" name="labeling/shapeTransparency"/>
-          <Option type="QString" value="0" name="labeling/shapeType"/>
-          <Option type="QString" value="255" name="labeling/textColorA"/>
-          <Option type="QString" value="255" name="labeling/textColorB"/>
-          <Option type="QString" value="255" name="labeling/textColorG"/>
-          <Option type="QString" value="255" name="labeling/textColorR"/>
-          <Option type="QString" value="0" name="labeling/textTransp"/>
-          <Option type="QString" value="0" name="labeling/upsidedownLabels"/>
-          <Option type="QString" value="" name="labeling/wrapChar"/>
-          <Option type="QString" value="0" name="labeling/xOffset"/>
-          <Option type="QString" value="0" name="labeling/yOffset"/>
-          <Option type="QString" value="0" name="labeling/zIndex"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="labeling/addDirectionSymbol" value="false" type="QString"/>
+          <Option name="labeling/angleOffset" value="0" type="QString"/>
+          <Option name="labeling/blendMode" value="0" type="QString"/>
+          <Option name="labeling/bufferBlendMode" value="0" type="QString"/>
+          <Option name="labeling/bufferColorA" value="255" type="QString"/>
+          <Option name="labeling/bufferColorB" value="255" type="QString"/>
+          <Option name="labeling/bufferColorG" value="255" type="QString"/>
+          <Option name="labeling/bufferColorR" value="255" type="QString"/>
+          <Option name="labeling/bufferDraw" value="false" type="QString"/>
+          <Option name="labeling/bufferJoinStyle" value="64" type="QString"/>
+          <Option name="labeling/bufferNoFill" value="false" type="QString"/>
+          <Option name="labeling/bufferSize" value="1" type="QString"/>
+          <Option name="labeling/bufferSizeInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/bufferTransp" value="0" type="QString"/>
+          <Option name="labeling/centroidInside" value="false" type="QString"/>
+          <Option name="labeling/centroidWhole" value="false" type="QString"/>
+          <Option name="labeling/decimals" value="3" type="QString"/>
+          <Option name="labeling/displayAll" value="false" type="QString"/>
+          <Option name="labeling/dist" value="0" type="QString"/>
+          <Option name="labeling/distInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/distMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/drawLabels" value="false" type="QString"/>
+          <Option name="labeling/enabled" value="false" type="QString"/>
+          <Option name="labeling/fieldName" value="position" type="QString"/>
+          <Option name="labeling/fitInPolygonOnly" value="false" type="QString"/>
+          <Option name="labeling/fontCapitals" value="0" type="QString"/>
+          <Option name="labeling/fontFamily" value="Myriad Pro" type="QString"/>
+          <Option name="labeling/fontItalic" value="false" type="QString"/>
+          <Option name="labeling/fontLetterSpacing" value="0" type="QString"/>
+          <Option name="labeling/fontLimitPixelSize" value="false" type="QString"/>
+          <Option name="labeling/fontMaxPixelSize" value="10000" type="QString"/>
+          <Option name="labeling/fontMinPixelSize" value="3" type="QString"/>
+          <Option name="labeling/fontSize" value="10" type="QString"/>
+          <Option name="labeling/fontSizeInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/fontStrikeout" value="false" type="QString"/>
+          <Option name="labeling/fontUnderline" value="false" type="QString"/>
+          <Option name="labeling/fontWeight" value="63" type="QString"/>
+          <Option name="labeling/fontWordSpacing" value="0" type="QString"/>
+          <Option name="labeling/formatNumbers" value="false" type="QString"/>
+          <Option name="labeling/isExpression" value="false" type="QString"/>
+          <Option name="labeling/labelOffsetInMapUnits" value="true" type="QString"/>
+          <Option name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/labelPerPart" value="false" type="QString"/>
+          <Option name="labeling/leftDirectionSymbol" value="&lt;" type="QString"/>
+          <Option name="labeling/limitNumLabels" value="false" type="QString"/>
+          <Option name="labeling/maxCurvedCharAngleIn" value="20" type="QString"/>
+          <Option name="labeling/maxCurvedCharAngleOut" value="-20" type="QString"/>
+          <Option name="labeling/maxNumLabels" value="2000" type="QString"/>
+          <Option name="labeling/mergeLines" value="false" type="QString"/>
+          <Option name="labeling/minFeatureSize" value="0" type="QString"/>
+          <Option name="labeling/multilineAlign" value="0" type="QString"/>
+          <Option name="labeling/multilineHeight" value="1" type="QString"/>
+          <Option name="labeling/namedStyle" value="Semibold" type="QString"/>
+          <Option name="labeling/obstacle" value="true" type="QString"/>
+          <Option name="labeling/obstacleFactor" value="1" type="QString"/>
+          <Option name="labeling/obstacleType" value="0" type="QString"/>
+          <Option name="labeling/offsetType" value="0" type="QString"/>
+          <Option name="labeling/placeDirectionSymbol" value="0" type="QString"/>
+          <Option name="labeling/placement" value="0" type="QString"/>
+          <Option name="labeling/placementFlags" value="10" type="QString"/>
+          <Option name="labeling/plussign" value="false" type="QString"/>
+          <Option name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString"/>
+          <Option name="labeling/preserveRotation" value="true" type="QString"/>
+          <Option name="labeling/previewBkgrdColor" value="#ffffff" type="QString"/>
+          <Option name="labeling/priority" value="5" type="QString"/>
+          <Option name="labeling/quadOffset" value="4" type="QString"/>
+          <Option name="labeling/repeatDistance" value="0" type="QString"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/repeatDistanceUnit" value="1" type="QString"/>
+          <Option name="labeling/reverseDirectionSymbol" value="false" type="QString"/>
+          <Option name="labeling/rightDirectionSymbol" value=">" type="QString"/>
+          <Option name="labeling/scaleMax" value="10000000" type="QString"/>
+          <Option name="labeling/scaleMin" value="1" type="QString"/>
+          <Option name="labeling/scaleVisibility" value="false" type="QString"/>
+          <Option name="labeling/shadowBlendMode" value="6" type="QString"/>
+          <Option name="labeling/shadowColorB" value="0" type="QString"/>
+          <Option name="labeling/shadowColorG" value="0" type="QString"/>
+          <Option name="labeling/shadowColorR" value="0" type="QString"/>
+          <Option name="labeling/shadowDraw" value="false" type="QString"/>
+          <Option name="labeling/shadowOffsetAngle" value="135" type="QString"/>
+          <Option name="labeling/shadowOffsetDist" value="1" type="QString"/>
+          <Option name="labeling/shadowOffsetGlobal" value="true" type="QString"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shadowOffsetUnits" value="1" type="QString"/>
+          <Option name="labeling/shadowRadius" value="1.5" type="QString"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" value="false" type="QString"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shadowRadiusUnits" value="1" type="QString"/>
+          <Option name="labeling/shadowScale" value="100" type="QString"/>
+          <Option name="labeling/shadowTransparency" value="30" type="QString"/>
+          <Option name="labeling/shadowUnder" value="0" type="QString"/>
+          <Option name="labeling/shapeBlendMode" value="0" type="QString"/>
+          <Option name="labeling/shapeBorderColorA" value="255" type="QString"/>
+          <Option name="labeling/shapeBorderColorB" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderColorG" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderColorR" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderWidth" value="0" type="QString"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeBorderWidthUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeDraw" value="true" type="QString"/>
+          <Option name="labeling/shapeFillColorA" value="255" type="QString"/>
+          <Option name="labeling/shapeFillColorB" value="138" type="QString"/>
+          <Option name="labeling/shapeFillColorG" value="0" type="QString"/>
+          <Option name="labeling/shapeFillColorR" value="101" type="QString"/>
+          <Option name="labeling/shapeJoinStyle" value="64" type="QString"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeOffsetUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeOffsetX" value="0" type="QString"/>
+          <Option name="labeling/shapeOffsetY" value="0" type="QString"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeRadiiUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeRadiiX" value="0" type="QString"/>
+          <Option name="labeling/shapeRadiiY" value="0" type="QString"/>
+          <Option name="labeling/shapeRotation" value="0" type="QString"/>
+          <Option name="labeling/shapeRotationType" value="0" type="QString"/>
+          <Option name="labeling/shapeSVGFile" value="" type="QString"/>
+          <Option name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeSizeType" value="0" type="QString"/>
+          <Option name="labeling/shapeSizeUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeSizeX" value="0" type="QString"/>
+          <Option name="labeling/shapeSizeY" value="0" type="QString"/>
+          <Option name="labeling/shapeTransparency" value="0" type="QString"/>
+          <Option name="labeling/shapeType" value="0" type="QString"/>
+          <Option name="labeling/textColorA" value="255" type="QString"/>
+          <Option name="labeling/textColorB" value="255" type="QString"/>
+          <Option name="labeling/textColorG" value="255" type="QString"/>
+          <Option name="labeling/textColorR" value="255" type="QString"/>
+          <Option name="labeling/textTransp" value="0" type="QString"/>
+          <Option name="labeling/upsidedownLabels" value="0" type="QString"/>
+          <Option name="labeling/wrapChar" value="" type="QString"/>
+          <Option name="labeling/xOffset" value="0" type="QString"/>
+          <Option name="labeling/yOffset" value="0" type="QString"/>
+          <Option name="labeling/zIndex" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="100000" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{4b343717-1e6e-45db-9c96-a3c1a5219761}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -8864,16 +7278,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="10" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="10" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8884,8 +7298,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -8894,8 +7308,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -8904,8 +7318,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -8916,31 +7330,36 @@ def my_form_open(dialog, layer, feature):
         <alias field="position" index="1" name=""/>
         <alias field="type" index="2" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="position"/>
+        <policy policy="Duplicate" field="type"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="position" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="type"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="position" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="position"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="position" width="-1" type="field" hidden="0"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9016,7 +7435,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="Polygon" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" styleCategories="AllStyleCategories">
+    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Polygon" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -9065,6 +7484,7 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -9081,7 +7501,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -9110,241 +7530,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="164,113,88,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="164,113,88,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="164,113,88,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="164,113,88,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="117,81,63,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="164,113,88,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="117,81,63,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="164,113,88,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="117,81,63,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="164,113,88,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="117,81,63,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="164,113,88,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="117,81,63,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="164,113,88,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="117,81,63,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="0,85,0,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,85,0,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="b_diagonal" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,85,0,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,85,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="b_diagonal" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,85,0,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,85,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9355,95 +7707,68 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="no_action" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="&quot;name&quot;"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="&quot;name&quot;" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{d22f44d7-7a5a-427f-afda-732ba2664339}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -9451,22 +7776,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="1" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="1" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </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" value="0" name="allowedGapsBuffer"/>
-            <Option type="bool" value="false" name="allowedGapsEnabled"/>
-            <Option type="QString" value="" name="allowedGapsLayer"/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -9524,43 +7849,51 @@ def my_form_open(dialog, layer, feature):
         <alias field="cone_len" index="4" name=""/>
         <alias field="fence_len" index="5" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="name"/>
+        <policy policy="Duplicate" field="group"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="cone_len"/>
+        <policy policy="Duplicate" field="fence_len"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="cone_len"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="group" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="cone_len" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="fence_len" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="group"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="day"/>
-        <constraint desc="" exp="" field="cone_len"/>
-        <constraint desc="" exp="" field="fence_len"/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="group" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
+        <constraint field="cone_len" exp="" desc=""/>
+        <constraint field="fence_len" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="415" name="name"/>
-          <column hidden="0" type="field" width="-1" name="group"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="cone_len"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
-          <column hidden="0" type="field" width="-1" name="fence_len"/>
+          <column name="name" width="415" type="field" hidden="0"/>
+          <column name="group" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="cone_len" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="fence_len" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9592,35 +7925,35 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="cone_len"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="fence_len"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="cone_len" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="fence_len" editable="1"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="fence_len"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="fence_len" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="fence_len"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="fence_len" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -9669,23 +8002,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -9699,26 +8033,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" precision="0" name="fence_len"/>
-        <field comment="" typeName="double precision" subType="0" type="6" 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"/>
-        <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" precision="0" name="cone_len"/>
+        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis maxScale="0" simplifyMaxScale="1" simplifyDrawingHints="1" labelsEnabled="1" readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" version="3.8.3-Zanzibar" simplifyDrawingTol="1" minScale="1e+08" simplifyAlgorithm="0">
+          <qgis labelsEnabled="1" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyDrawingHints="1" simplifyLocal="1" simplifyAlgorithm="0" simplifyMaxScale="1" version="3.8.3-Zanzibar" minScale="1e+08">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 symbollevels="1" enableorderby="0" type="RuleRenderer" forceraster="0">
+            <renderer-v2 enableorderby="0" symbollevels="1" type="RuleRenderer" forceraster="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible"/>
+                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="0" label="Visible"/>
               </rules>
               <symbols>
-                <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" alpha="1">
-                  <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <symbol name="0" clip_to_extent="1" alpha="1" type="line" force_rhr="0">
+                  <layer locked="0" enabled="1" pass="0" class="SimpleLine">
                     <prop v="square" k="capstyle"/>
                     <prop v="5;2" k="customdash"/>
                     <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -9737,9 +8071,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" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -9750,62 +8084,62 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style namedStyle="Regular" fontItalic="0" fontUnderline="0" fontLetterSpacing="0" isExpression="0" fontCapitals="0" previewBkgrdColor="#ffffff" textColor="0,0,0,255" fontStrikeout="0" multilineHeight="1" blendMode="0" fieldName="comment" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.8" fontWordSpacing="0" fontSize="11" fontWeight="50" fontSizeUnit="Point" useSubstitutions="0" fontFamily="Myriad Pro">
-                      <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <background shapeRadiiUnit="MM" shapeSizeY="1" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.6" shapeOffsetUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.6" shapeOffsetY="0" shapeSizeX="1"/>
-                      <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowScale="100" shadowOpacity="0.7" shadowBlendMode="6"/>
+                    <text-style fontSizeUnit="Point" textOpacity="0.8" fontLetterSpacing="0" fontFamily="Myriad Pro" fontItalic="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontCapitals="0" fieldName="comment" fontSize="11" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+                      <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0"/>
+                      <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeSizeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeOffsetY="0" shapeType="0" shapeBorderWidth="0.6" shapeRadiiX="1" shapeBorderColor="255,255,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="0.6" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeOffsetUnit="MM"/>
+                      <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowScale="100" shadowDraw="0" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="4294967295" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-                    <placement maxCurvedCharAngleIn="25" offsetUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" offsetType="0" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" dist="5" priority="5" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="4" placementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" geometryGenerator="" repeatDistanceUnits="MM" centroidWhole="0" xOffset="0" repeatDistance="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" centroidInside="0" yOffset="0" rotationAngle="0" geometryGeneratorType="PointGeometry"/>
-                    <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" displayAll="1" fontLimitPixelSize="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="1"/>
+                    <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" wrapChar="" rightDirectionSymbol=">" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+                    <placement distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" maxCurvedCharAngleOut="-25" rotationAngle="0" geometryGeneratorType="PointGeometry" geometryGenerator="" centroidWhole="0" maxCurvedCharAngleIn="25" placementFlags="2" fitInPolygonOnly="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" priority="5" quadOffset="4" dist="5" repeatDistanceUnits="MM" yOffset="0" xOffset="0" centroidInside="0" placement="4" geometryGeneratorEnabled="0" offsetType="0"/>
+                    <rendering displayAll="1" fontMinPixelSize="3" scaleMax="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="1" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
-                        <Option type="Map" name="properties">
-                          <Option type="Map" name="PositionX">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties" type="Map">
+                          <Option name="PositionX" type="Map">
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
-                          <Option type="Map" name="PositionY">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                          <Option name="PositionY" type="Map">
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                         </Option>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
                 <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" fontLetterSpacing="0" isExpression="1" fontCapitals="0" previewBkgrdColor="#ffffff" textColor="0,0,0,255" fontStrikeout="0" multilineHeight="1" blendMode="0" fieldName="round( $length, 1) || 'm'" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" fontSize="12" fontWeight="63" fontSizeUnit="Point" useSubstitutions="0" fontFamily="Myriad Pro">
-                      <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0"/>
-                      <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowScale="100" shadowOpacity="0.7" shadowBlendMode="6"/>
+                    <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontItalic="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontCapitals="0" fieldName="round( $length, 1) || 'm'" fontSize="12" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+                      <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0"/>
+                      <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeOffsetY="0" shapeType="0" shapeBorderWidth="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeOffsetUnit="MM"/>
+                      <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowScale="100" shadowDraw="0" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                       <substitutions/>
                     </text-style>
-                    <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="4294967295" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-                    <placement maxCurvedCharAngleIn="25" offsetUnits="MM" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" offsetType="0" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" dist="1" priority="5" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" placementFlags="15" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" geometryGenerator="" repeatDistanceUnits="MM" centroidWhole="0" xOffset="0" repeatDistance="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" centroidInside="0" yOffset="0" rotationAngle="0" geometryGeneratorType="PointGeometry"/>
-                    <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" displayAll="0" fontLimitPixelSize="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+                    <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" wrapChar="" rightDirectionSymbol=">" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+                    <placement distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" maxCurvedCharAngleOut="-25" rotationAngle="0" geometryGeneratorType="PointGeometry" geometryGenerator="" centroidWhole="0" maxCurvedCharAngleIn="25" placementFlags="15" fitInPolygonOnly="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" priority="5" quadOffset="4" dist="1" repeatDistanceUnits="MM" yOffset="0" xOffset="0" centroidInside="0" placement="2" geometryGeneratorEnabled="0" offsetType="0"/>
+                    <rendering displayAll="0" fontMinPixelSize="3" scaleMax="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
-                        <Option type="Map" name="properties">
-                          <Option type="Map" name="PositionX">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties" type="Map">
+                          <Option name="PositionX" type="Map">
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
-                          <Option type="Map" name="PositionY">
-                            <Option type="bool" value="true" name="active"/>
-                            <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                            <Option type="int" value="2" name="type"/>
+                          <Option name="PositionY" type="Map">
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                         </Option>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -9822,21 +8156,21 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-              <DiagramCategory sizeType="MM" rotationOffset="270" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" height="15" width="15" opacity="1" labelPlacementMethod="XHeight" enabled="0" barWidth="5" penWidth="0" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
+              <DiagramCategory scaleDependency="Area" minScaleDenominator="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" enabled="0" opacity="1" penWidth="0" diagramOrientation="Up" penColor="#000000" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" width="15" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
                 <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute color="#000000" label="" field=""/>
+                <attribute field="" color="#000000" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings priority="0" showAll="1" dist="0" obstacle="0" placement="2" linePlacementFlags="18" zIndex="0">
+            <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" dist="0" linePlacementFlags="18">
               <properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -9920,81 +8254,81 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias index="0" field="id" name=""/>
-              <alias index="1" field="group" name=""/>
-              <alias index="2" field="comment" name=""/>
-              <alias index="3" field="moveable" name=""/>
-              <alias index="4" field="type" name=""/>
-              <alias index="5" field="name" name=""/>
-              <alias index="6" field="hidden" name=""/>
-              <alias index="7" field="auxiliary_storage_labeling_positiony" name=""/>
-              <alias index="8" field="auxiliary_storage_labeling_positionx" name=""/>
-              <alias index="9" field="fence_len" name=""/>
-              <alias index="10" field="cone_len" name=""/>
+              <alias field="id" name="" index="0"/>
+              <alias field="group" name="" index="1"/>
+              <alias field="comment" name="" index="2"/>
+              <alias field="moveable" name="" index="3"/>
+              <alias field="type" name="" index="4"/>
+              <alias field="name" name="" index="5"/>
+              <alias field="hidden" name="" index="6"/>
+              <alias field="auxiliary_storage_labeling_positiony" name="" index="7"/>
+              <alias field="auxiliary_storage_labeling_positionx" name="" index="8"/>
+              <alias field="fence_len" name="" index="9"/>
+              <alias field="cone_len" name="" index="10"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <default applyOnUpdate="0" expression="" field="id"/>
-              <default applyOnUpdate="0" expression="" field="group"/>
-              <default applyOnUpdate="0" expression="" field="comment"/>
-              <default applyOnUpdate="0" expression="" field="moveable"/>
-              <default applyOnUpdate="0" expression="" field="type"/>
-              <default applyOnUpdate="0" expression="" field="name"/>
-              <default applyOnUpdate="0" expression="" field="hidden"/>
-              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positiony"/>
-              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positionx"/>
-              <default applyOnUpdate="0" expression="" field="fence_len"/>
-              <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="group" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="comment" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="moveable" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="name" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="hidden" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="auxiliary_storage_labeling_positiony" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="auxiliary_storage_labeling_positionx" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="fence_len" exp_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" unique_strength="0" field="cone_len" exp_strength="0"/>
+              <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="comment" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="moveable" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="hidden" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
             </constraints>
             <constraintExpressions>
-              <constraint desc="" exp="" field="id"/>
-              <constraint desc="" exp="" field="group"/>
-              <constraint desc="" exp="" field="comment"/>
-              <constraint desc="" exp="" field="moveable"/>
-              <constraint desc="" exp="" field="type"/>
-              <constraint desc="" exp="" field="name"/>
-              <constraint desc="" exp="" field="hidden"/>
-              <constraint desc="" exp="" field="auxiliary_storage_labeling_positiony"/>
-              <constraint desc="" exp="" field="auxiliary_storage_labeling_positionx"/>
-              <constraint desc="" exp="" field="fence_len"/>
-              <constraint desc="" exp="" field="cone_len"/>
+              <constraint field="id" exp="" desc=""/>
+              <constraint field="group" exp="" desc=""/>
+              <constraint field="comment" exp="" desc=""/>
+              <constraint field="moveable" exp="" desc=""/>
+              <constraint field="type" exp="" desc=""/>
+              <constraint field="name" exp="" desc=""/>
+              <constraint field="hidden" exp="" desc=""/>
+              <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
+              <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
+              <constraint field="fence_len" exp="" desc=""/>
+              <constraint field="cone_len" exp="" desc=""/>
             </constraintExpressions>
             <expressionfields>
-              <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" name="fence_len"/>
-              <field comment="" typeName="double precision" subType="0" type="6" 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"/>
-              <field comment="" typeName="double precision" subType="0" type="6" 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"/>
+              <field name="fence_len" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment="" typeName="double precision" subType="0" type="6" precision="0"/>
+              <field name="fence_len" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" typeName="double precision" subType="0" type="6" precision="0"/>
+              <field name="cone_len" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment="" typeName="double precision" subType="0" type="6" precision="0"/>
             </expressionfields>
             <attributeactions>
               <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
+            <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
               <columns>
-                <column hidden="0" width="-1" type="field" name="id"/>
-                <column hidden="0" width="-1" type="field" name="group"/>
-                <column hidden="1" width="-1" type="actions"/>
-                <column hidden="0" width="223" type="field" name="comment"/>
-                <column hidden="0" width="-1" type="field" name="moveable"/>
-                <column hidden="0" width="-1" type="field" name="type"/>
-                <column hidden="0" width="414" type="field" name="name"/>
-                <column hidden="0" width="-1" type="field" name="hidden"/>
-                <column hidden="0" width="-1" type="field" name="fence_len"/>
-                <column hidden="0" width="-1" type="field" name="cone_len"/>
-                <column hidden="1" width="-1" type="field" name="auxiliary_storage_labeling_positiony"/>
-                <column hidden="1" width="-1" type="field" name="auxiliary_storage_labeling_positionx"/>
+                <column name="id" width="-1" type="field" hidden="0"/>
+                <column name="group" width="-1" type="field" hidden="0"/>
+                <column width="-1" type="actions" hidden="1"/>
+                <column name="comment" width="223" type="field" hidden="0"/>
+                <column name="moveable" width="-1" type="field" hidden="0"/>
+                <column name="type" width="-1" type="field" hidden="0"/>
+                <column name="name" width="414" type="field" hidden="0"/>
+                <column name="hidden" width="-1" type="field" hidden="0"/>
+                <column name="fence_len" width="-1" type="field" hidden="0"/>
+                <column name="cone_len" width="-1" type="field" hidden="0"/>
+                <column name="auxiliary_storage_labeling_positiony" width="-1" type="field" hidden="1"/>
+                <column name="auxiliary_storage_labeling_positionx" width="-1" type="field" hidden="1"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -10025,18 +8359,18 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-              <field editable="1" name="comment"/>
-              <field editable="0" name="cone_len"/>
-              <field editable="0" name="fence_len"/>
-              <field editable="1" name="group"/>
-              <field editable="1" name="hidden"/>
-              <field editable="1" name="id"/>
-              <field editable="0" name="length"/>
-              <field editable="1" name="moveable"/>
-              <field editable="1" name="name"/>
-              <field editable="1" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+              <field name="comment" editable="1"/>
+              <field name="cone_len" editable="0"/>
+              <field name="fence_len" editable="0"/>
+              <field name="group" editable="1"/>
+              <field name="hidden" editable="1"/>
+              <field name="id" editable="1"/>
+              <field name="length" editable="0"/>
+              <field name="moveable" editable="1"/>
+              <field name="name" editable="1"/>
+              <field name="type" editable="1"/>
             </editable>
             <labelOnTop>
               <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
@@ -10067,677 +8401,458 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{b24077c4-36ed-44b5-830f-d1243f319030}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="133,182,111,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="133,182,111,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="133,182,111,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="133,182,111,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="95,130,79,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="133,182,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="95,130,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="133,182,111,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="95,130,79,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{b240180c-f59a-4dbd-a750-c3204efd6d54}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="133,182,111,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="95,130,79,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="133,182,111,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="95,130,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="133,182,111,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="95,130,79,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="1" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="1" type="RuleRenderer" forceraster="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
           <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" label="Show in fencing maps">
-            <rule symbol="0" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" label="Cones"/>
-            <rule symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" label="Moveable fences"/>
-            <rule symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" label="Fixed fences"/>
-            <rule symbol="3" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" label="Construction"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" symbol="0" label="Cones"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" symbol="1" label="Moveable fences"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" symbol="2" label="Fixed fences"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" symbol="3" label="Construction"/>
           </rule>
-          <rule symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" label="Is Visible"/>
-          <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" symbol="4" label="Is Visible"/>
+          <rule key="{29865286-9e35-459b-929c-beb87e7538de}" symbol="5" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="round" name="capstyle"/>
-                <Option type="QString" value="1;4" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="Point" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="255,255,0,255" name="line_color"/>
-                <Option type="QString" value="dot" name="line_style"/>
-                <Option type="QString" value="1" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="1" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="round" type="QString"/>
+                <Option name="customdash" value="1;4" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="Point" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="255,255,0,255" type="QString"/>
+                <Option name="line_style" value="dot" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="round" k="capstyle"/>
-              <prop v="1;4" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="Point" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="dot" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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')" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="1" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{67070045-bee5-4271-87d3-86da17eb7dbe}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="round" name="capstyle"/>
-                <Option type="QString" value="4;3" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="255,255,0,255" name="line_color"/>
-                <Option type="QString" value="dash" name="line_style"/>
-                <Option type="QString" value="1" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="round" type="QString"/>
+                <Option name="customdash" value="4;3" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="255,255,0,255" type="QString"/>
+                <Option name="line_style" value="dash" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="round" k="capstyle"/>
-              <prop v="4;3" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="dash" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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')" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="2" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="255,255,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.8" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="255,255,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.8" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.8" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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')" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="3" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="3" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{63390b08-62bc-49cf-9253-f38f2f5873ba}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0,255,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.8" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,255,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.8" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,255,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.8" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="4" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="4" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="255,255,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.26" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="255,255,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="5" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="5" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="213,180,60,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.26" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="213,180,60,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="213,180,60,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10748,628 +8863,527 @@ def my_form_open(dialog, layer, feature):
         <rules key="{23c89a1d-a8e0-4ceb-943a-dc351cead91c}">
           <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}">
             <settings calloutType="simple">
-              <text-style namedStyle="Regular" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="comment" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.80000000000000004" fontWordSpacing="0" textOrientation="horizontal" fontSize="11" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="0.80000000000000004" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="comment" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="1" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.59999999999999998" shapeOffsetUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.59999999999999998" shapeOffsetY="0" shapeSizeX="1">
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="255,255,0,255" shapeBorderWidth="0.59999999999999998" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="0.59999999999999998" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="round" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="255,255,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.6" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="255,255,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.6" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="round" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="255,255,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.6" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="4294967295" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MM" priority="5" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="14" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="2" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="5"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1.8200000000000001" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="1"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="4294967295" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="5" xOffset="0" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="14" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="1" obstacleFactor="1.8200000000000001" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Fence lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="11" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="196,60,57,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="196,60,57,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="196,60,57,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                        <Option type="QString" value="no" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="128,128,128,255" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MM" priority="6" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="LineGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="14" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="2" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="6" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="14" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="1" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="1" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Cones lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="11" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="196,60,57,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="196,60,57,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="196,60,57,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                        <Option type="QString" value="no" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="128,128,128,255" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MM" priority="6" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="LineGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="14" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="2" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="6" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="14" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="1" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="1" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0" key="{359df8b8-e018-47fc-a639-e6e8d7640da2}">
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{359df8b8-e018-47fc-a639-e6e8d7640da2}" active="0">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="11" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="196,60,57,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="196,60,57,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="196,60,57,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                        <Option type="QString" value="no" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="128,128,128,255" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MM" priority="6" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="LineGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="14" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="2" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="6" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="14" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="1" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="1" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -11378,95 +9392,68 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="&quot;id&quot;"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="&quot;id&quot;" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11474,16 +9461,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11573,63 +9560,75 @@ def my_form_open(dialog, layer, feature):
         <alias field="fence_len" index="8" name=""/>
         <alias field="cone_len" index="9" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="group"/>
+        <policy policy="Duplicate" field="comment"/>
+        <policy policy="Duplicate" field="moveable"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="name"/>
+        <policy policy="Duplicate" field="hidden"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="fence_len"/>
+        <policy policy="Duplicate" field="cone_len"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="comment"/>
-        <default applyOnUpdate="0" expression="" field="moveable"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="hidden"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="fence_len"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="group" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="comment" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="moveable" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="hidden" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="fence_len" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="cone_len" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="comment" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="moveable" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="hidden" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="group"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="moveable"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="hidden"/>
-        <constraint desc="" exp="" field="day"/>
-        <constraint desc="" exp="" field="fence_len"/>
-        <constraint desc="" exp="" field="cone_len"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="group" exp="" desc=""/>
+        <constraint field="comment" exp="" desc=""/>
+        <constraint field="moveable" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="hidden" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
+        <constraint field="fence_len" exp="" desc=""/>
+        <constraint field="cone_len" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" precision="0" name="fence_len"/>
-        <field comment="" typeName="double precision" subType="0" type="6" 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"/>
-        <field comment="" typeName="double precision" subType="0" type="6" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" precision="0" name="cone_len"/>
+        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;name&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="group"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="373" name="comment"/>
-          <column hidden="0" type="field" width="-1" name="moveable"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="316" name="name"/>
-          <column hidden="0" type="field" width="-1" name="hidden"/>
-          <column hidden="0" type="field" width="-1" name="fence_len"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
-          <column hidden="0" type="field" width="-1" name="cone_len"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="group" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="comment" width="373" type="field" hidden="0"/>
+          <column name="moveable" width="-1" type="field" hidden="0"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="name" width="316" type="field" hidden="0"/>
+          <column name="hidden" width="-1" type="field" hidden="0"/>
+          <column name="fence_len" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="cone_len" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11661,53 +9660,53 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="comment"/>
-        <field editable="0" name="cone_len"/>
-        <field editable="1" name="day"/>
-        <field editable="0" name="fence_len"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="hidden"/>
-        <field editable="1" name="id"/>
-        <field editable="0" name="length"/>
-        <field editable="1" name="moveable"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="comment" editable="1"/>
+        <field name="cone_len" editable="0"/>
+        <field name="day" editable="1"/>
+        <field name="fence_len" editable="0"/>
+        <field name="group" editable="1"/>
+        <field name="hidden" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length" editable="0"/>
+        <field name="moveable" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="comment"/>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="fence_len"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="hidden"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length"/>
-        <field labelOnTop="0" name="moveable"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="comment" labelOnTop="0"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="fence_len" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="hidden" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length" labelOnTop="0"/>
+        <field name="moveable" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="comment"/>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="fence_len"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="hidden"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="moveable"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="comment" reuseLastValue="0"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="fence_len" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="hidden" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="moveable" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -11747,19 +9746,20 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -11780,273 +9780,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="164,113,88,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="164,113,88,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="164,113,88,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="164,113,88,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="117,81,63,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="164,113,88,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="117,81,63,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="164,113,88,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="117,81,63,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="164,113,88,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="117,81,63,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="164,113,88,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="117,81,63,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="164,113,88,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="117,81,63,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{c73fab62-3b89-497c-a33c-6825e949a9db}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,178,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="1" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,178,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,178,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12057,93 +9973,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="&quot;id&quot;" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="&quot;id&quot;" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" italic="1" style="0" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12151,16 +10040,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12178,23 +10067,26 @@ def my_form_open(dialog, layer, feature):
       <aliases>
         <alias field="id" index="0" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
+        <constraint field="id" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12226,10 +10118,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -12237,7 +10129,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="MultiPolygon" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" refreshOnNotifyMessage="" geometry="Polygon" styleCategories="AllStyleCategories">
+    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -12277,19 +10169,20 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -12310,241 +10203,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="213,180,60,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="213,180,60,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="213,180,60,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="213,180,60,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="152,129,43,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="213,180,60,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="152,129,43,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="213,180,60,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="152,129,43,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{cf57a051-b643-427d-bb3e-3d8860aa79df}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="213,180,60,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="152,129,43,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="213,180,60,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="152,129,43,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="213,180,60,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="152,129,43,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="26,0,201,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                <Option type="QString" value="dot" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="b_diagonal" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="26,0,201,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="dot" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="b_diagonal" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="26,0,201,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="dot" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12555,104 +10380,77 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <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 type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="100000" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12660,22 +10458,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="2" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
-            <Option type="Map" name="properties">
-              <Option type="Map" name="show">
-                <Option type="bool" value="true" name="active"/>
-                <Option type="QString" value="id" name="field"/>
-                <Option type="int" value="2" name="type"/>
+            <Option name="name" value="" type="QString"/>
+            <Option name="properties" type="Map">
+              <Option name="show" type="Map">
+                <Option name="active" value="true" type="bool"/>
+                <Option name="field" value="id" type="QString"/>
+                <Option name="type" value="2" type="int"/>
               </Option>
             </Option>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12686,8 +10484,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -12696,8 +10494,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -12706,8 +10504,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -12726,35 +10524,41 @@ def my_form_open(dialog, layer, feature):
         <alias field="page" index="2" name=""/>
         <alias field="day" index="3" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="page"/>
+        <policy policy="Duplicate" field="day"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="page"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="page" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="page" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="page"/>
-        <constraint desc="" exp="" field="day"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="page" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;page&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;page&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
-          <column hidden="0" type="field" width="-1" name="page"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="page" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12786,14 +10590,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="page"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="page" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="page"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="page" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -12801,7 +10605,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="Point" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" refreshOnNotifyMessage="" geometry="Point" styleCategories="AllStyleCategories">
+    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -12850,23 +10654,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -12877,7 +10682,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join editable="1" customPrefix="csv_" upsertOnEdit="1" memoryCache="0" joinFieldName="position" targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" cascadedDelete="0" hasCustomPrefix="1">
+        <join memoryCache="0" cascadedDelete="0" targetFieldName="position" joinFieldName="position" hasCustomPrefix="1" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" editable="1" upsertOnEdit="1" customPrefix="csv_">
           <joinFieldsSubset>
             <field name="day"/>
             <field name="position"/>
@@ -12904,378 +10709,264 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="id" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="id" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{44c3350e-7341-440a-99a7-76d72f8be3f3}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="114,155,111,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="114,155,111,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="114,155,111,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="114,155,111,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="81,111,79,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="114,155,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="81,111,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="114,155,111,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="81,111,79,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="114,155,111,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="81,111,79,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="114,155,111,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="81,111,79,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="114,155,111,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="81,111,79,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" description="Show in marshal overview" checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" label="Show by day in marshal plan"/>
-          <rule symbol="1" checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" label="Always show in marshal plan"/>
-          <rule symbol="2" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" label="Show in marshal maps"/>
+          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" symbol="0" label="Show by day in marshal plan"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" symbol="1" label="Always show in marshal plan" checkstate="0"/>
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" symbol="2" label="Show in marshal maps" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="0.8">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="marker" alpha="0.8" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}" locked="0" enabled="1" pass="1" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="circle" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="5" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="Pixel" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="Pixel" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="Pixel" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="1" frame_rate="10" clip_to_extent="1" alpha="0.8">
+          <symbol frame_rate="10" name="1" clip_to_extent="1" type="marker" alpha="0.8" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{984895dc-f666-478a-9853-cf8b1ad766f1}" locked="0" enabled="1" pass="1" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="circle" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="5" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="Pixel" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="Pixel" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="Pixel" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="2" frame_rate="10" clip_to_extent="1" alpha="0.01">
+          <symbol frame_rate="10" name="2" clip_to_extent="1" type="marker" alpha="0.01" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}" locked="0" enabled="1" pass="1" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="circle" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="0.1" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="0.1" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13286,953 +10977,822 @@ def my_form_open(dialog, layer, feature):
         <rules key="{2cd5bd60-2418-42c7-89dd-9f389593e547}">
           <rule description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{56651b46-8545-482e-850b-aa88b9a8dff4}">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" fontWordSpacing="0" textOrientation="horizontal" fontSize="6" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="6" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.5" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeOffsetY="0" shapeSizeX="0">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="231,113,72,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="231,113,72,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="231,113,72,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.1" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.1" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="0" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="2" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="2" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" active="0" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}">
+          <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}" active="0">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" fontWordSpacing="0" textOrientation="horizontal" fontSize="6" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="6" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.5" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeOffsetY="0" shapeSizeX="0">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="231,113,72,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="231,113,72,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="231,113,72,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.1" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.1" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="0" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="2" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="2" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" filter="'marshal' = attribute( @atlas_feature , 'type' )" active="0" key="{fd239986-b557-4314-b05a-d8c40105e0bc}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{fd239986-b557-4314-b05a-d8c40105e0bc}" active="0">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.5" fontWordSpacing="0" textOrientation="horizontal" fontSize="6" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="0.5" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="6" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.5" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeOffsetY="0" shapeSizeX="0.20000000000000001">
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.20000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.4" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.4" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.4" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="AlwaysShow">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( @atlasfeature_id = $id, 1, 0)" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="AlwaysShow" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlasfeature_id = $id, 1, 0)" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="FontOpacity">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="FontOpacity" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="FontStyle">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="ObstacleFactor">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                      <Option name="ObstacleFactor" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="Priority">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="Priority" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="ShapeOpacity">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="ShapeOpacity" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( @atlas_featureid = $id, 8, 6 )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlas_featureid = $id, 8, 6 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
-                      <Option type="Map" name="ZIndex">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression"/>
-                        <Option type="int" value="3" name="type"/>
+                      <Option name="ZIndex" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString"/>
+                        <Option name="type" value="3" type="int"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="1" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="8" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="0" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="5" upsidedownLabels="0" obstacleFactor="1.8" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="1" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="8" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="5" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1.8" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlasfeature_id = $id, 1, 0)" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlasfeature_id = $id, 1, 0)" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlas_featureid = $id, 8, 6 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlas_featureid = $id, 8, 6 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}">
             <settings calloutType="simple">
-              <text-style namedStyle="Regular" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.59999999999999998" fontWordSpacing="0" textOrientation="horizontal" fontSize="6" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="0.59999999999999998" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="6" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.59999999999999998" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeOffsetY="0" shapeSizeX="0.20000000000000001">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.20000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.59999999999999998" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="213,180,60,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="213,180,60,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="213,180,60,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.4" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.4" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.4" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="1" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="8" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="0" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="5" upsidedownLabels="0" obstacleFactor="1.8" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="1" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="8" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="5" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1.8" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{84d13a6c-d354-4356-be1f-5803dabd2773}">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" fontWordSpacing="0" textOrientation="horizontal" fontSize="8" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="8" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.90000000000000002" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeOffsetY="0" shapeSizeX="0.20000000000000001">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.20000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.90000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="133,182,111,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="133,182,111,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="133,182,111,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,0,255" name="color"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.4" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,0,255" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.4" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,0,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.4" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="false" name="active"/>
-                              <Option type="int" value="1" name="type"/>
-                              <Option type="QString" value="" name="val"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="false" type="bool"/>
+                              <Option name="type" value="1" type="int"/>
+                              <Option name="val" value="" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="1" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="0" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="0" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="10" upsidedownLabels="0" obstacleFactor="1.8" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="1" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="10" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1.8" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -14241,236 +11801,209 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <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 name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="QString" value="false" name="labeling/addDirectionSymbol"/>
-          <Option type="QString" value="0" name="labeling/angleOffset"/>
-          <Option type="QString" value="0" name="labeling/blendMode"/>
-          <Option type="QString" value="0" name="labeling/bufferBlendMode"/>
-          <Option type="QString" value="255" name="labeling/bufferColorA"/>
-          <Option type="QString" value="255" name="labeling/bufferColorB"/>
-          <Option type="QString" value="255" name="labeling/bufferColorG"/>
-          <Option type="QString" value="255" name="labeling/bufferColorR"/>
-          <Option type="QString" value="false" name="labeling/bufferDraw"/>
-          <Option type="QString" value="64" name="labeling/bufferJoinStyle"/>
-          <Option type="QString" value="false" name="labeling/bufferNoFill"/>
-          <Option type="QString" value="1" name="labeling/bufferSize"/>
-          <Option type="QString" value="false" name="labeling/bufferSizeInMapUnits"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale"/>
-          <Option type="QString" value="0" name="labeling/bufferTransp"/>
-          <Option type="QString" value="false" name="labeling/centroidInside"/>
-          <Option type="QString" value="false" name="labeling/centroidWhole"/>
-          <Option type="QString" value="3" name="labeling/decimals"/>
-          <Option type="QString" value="false" name="labeling/displayAll"/>
-          <Option type="QString" value="0" name="labeling/dist"/>
-          <Option type="QString" value="false" name="labeling/distInMapUnits"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/distMapUnitScale"/>
-          <Option type="QString" value="false" name="labeling/drawLabels"/>
-          <Option type="QString" value="false" name="labeling/enabled"/>
-          <Option type="QString" value="position" name="labeling/fieldName"/>
-          <Option type="QString" value="false" name="labeling/fitInPolygonOnly"/>
-          <Option type="QString" value="0" name="labeling/fontCapitals"/>
-          <Option type="QString" value="Myriad Pro" name="labeling/fontFamily"/>
-          <Option type="QString" value="false" name="labeling/fontItalic"/>
-          <Option type="QString" value="0" name="labeling/fontLetterSpacing"/>
-          <Option type="QString" value="false" name="labeling/fontLimitPixelSize"/>
-          <Option type="QString" value="10000" name="labeling/fontMaxPixelSize"/>
-          <Option type="QString" value="3" name="labeling/fontMinPixelSize"/>
-          <Option type="QString" value="10" name="labeling/fontSize"/>
-          <Option type="QString" value="false" name="labeling/fontSizeInMapUnits"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale"/>
-          <Option type="QString" value="false" name="labeling/fontStrikeout"/>
-          <Option type="QString" value="false" name="labeling/fontUnderline"/>
-          <Option type="QString" value="63" name="labeling/fontWeight"/>
-          <Option type="QString" value="0" name="labeling/fontWordSpacing"/>
-          <Option type="QString" value="false" name="labeling/formatNumbers"/>
-          <Option type="QString" value="false" name="labeling/isExpression"/>
-          <Option type="QString" value="true" name="labeling/labelOffsetInMapUnits"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale"/>
-          <Option type="QString" value="false" name="labeling/labelPerPart"/>
-          <Option type="QString" value="&lt;" name="labeling/leftDirectionSymbol"/>
-          <Option type="QString" value="false" name="labeling/limitNumLabels"/>
-          <Option type="QString" value="20" name="labeling/maxCurvedCharAngleIn"/>
-          <Option type="QString" value="-20" name="labeling/maxCurvedCharAngleOut"/>
-          <Option type="QString" value="2000" name="labeling/maxNumLabels"/>
-          <Option type="QString" value="false" name="labeling/mergeLines"/>
-          <Option type="QString" value="0" name="labeling/minFeatureSize"/>
-          <Option type="QString" value="0" name="labeling/multilineAlign"/>
-          <Option type="QString" value="1" name="labeling/multilineHeight"/>
-          <Option type="QString" value="Semibold" name="labeling/namedStyle"/>
-          <Option type="QString" value="true" name="labeling/obstacle"/>
-          <Option type="QString" value="1" name="labeling/obstacleFactor"/>
-          <Option type="QString" value="0" name="labeling/obstacleType"/>
-          <Option type="QString" value="0" name="labeling/offsetType"/>
-          <Option type="QString" value="0" name="labeling/placeDirectionSymbol"/>
-          <Option type="QString" value="0" name="labeling/placement"/>
-          <Option type="QString" value="10" name="labeling/placementFlags"/>
-          <Option type="QString" value="false" name="labeling/plussign"/>
-          <Option type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder"/>
-          <Option type="QString" value="true" name="labeling/preserveRotation"/>
-          <Option type="QString" value="#ffffff" name="labeling/previewBkgrdColor"/>
-          <Option type="QString" value="5" name="labeling/priority"/>
-          <Option type="QString" value="4" name="labeling/quadOffset"/>
-          <Option type="QString" value="0" name="labeling/repeatDistance"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/repeatDistanceUnit"/>
-          <Option type="QString" value="false" name="labeling/reverseDirectionSymbol"/>
-          <Option type="QString" value=">" name="labeling/rightDirectionSymbol"/>
-          <Option type="QString" value="10000000" name="labeling/scaleMax"/>
-          <Option type="QString" value="1" name="labeling/scaleMin"/>
-          <Option type="QString" value="false" name="labeling/scaleVisibility"/>
-          <Option type="QString" value="6" name="labeling/shadowBlendMode"/>
-          <Option type="QString" value="0" name="labeling/shadowColorB"/>
-          <Option type="QString" value="0" name="labeling/shadowColorG"/>
-          <Option type="QString" value="0" name="labeling/shadowColorR"/>
-          <Option type="QString" value="false" name="labeling/shadowDraw"/>
-          <Option type="QString" value="135" name="labeling/shadowOffsetAngle"/>
-          <Option type="QString" value="1" name="labeling/shadowOffsetDist"/>
-          <Option type="QString" value="true" name="labeling/shadowOffsetGlobal"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shadowOffsetUnits"/>
-          <Option type="QString" value="1.5" name="labeling/shadowRadius"/>
-          <Option type="QString" value="false" name="labeling/shadowRadiusAlphaOnly"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shadowRadiusUnits"/>
-          <Option type="QString" value="100" name="labeling/shadowScale"/>
-          <Option type="QString" value="30" name="labeling/shadowTransparency"/>
-          <Option type="QString" value="0" name="labeling/shadowUnder"/>
-          <Option type="QString" value="0" name="labeling/shapeBlendMode"/>
-          <Option type="QString" value="255" name="labeling/shapeBorderColorA"/>
-          <Option type="QString" value="128" name="labeling/shapeBorderColorB"/>
-          <Option type="QString" value="128" name="labeling/shapeBorderColorG"/>
-          <Option type="QString" value="128" name="labeling/shapeBorderColorR"/>
-          <Option type="QString" value="0" name="labeling/shapeBorderWidth"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shapeBorderWidthUnits"/>
-          <Option type="QString" value="true" name="labeling/shapeDraw"/>
-          <Option type="QString" value="255" name="labeling/shapeFillColorA"/>
-          <Option type="QString" value="138" name="labeling/shapeFillColorB"/>
-          <Option type="QString" value="0" name="labeling/shapeFillColorG"/>
-          <Option type="QString" value="101" name="labeling/shapeFillColorR"/>
-          <Option type="QString" value="64" name="labeling/shapeJoinStyle"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shapeOffsetUnits"/>
-          <Option type="QString" value="0" name="labeling/shapeOffsetX"/>
-          <Option type="QString" value="0" name="labeling/shapeOffsetY"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale"/>
-          <Option type="QString" value="1" name="labeling/shapeRadiiUnits"/>
-          <Option type="QString" value="0" name="labeling/shapeRadiiX"/>
-          <Option type="QString" value="0" name="labeling/shapeRadiiY"/>
-          <Option type="QString" value="0" name="labeling/shapeRotation"/>
-          <Option type="QString" value="0" name="labeling/shapeRotationType"/>
-          <Option type="QString" value="" name="labeling/shapeSVGFile"/>
-          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale"/>
-          <Option type="QString" value="0" name="labeling/shapeSizeType"/>
-          <Option type="QString" value="1" name="labeling/shapeSizeUnits"/>
-          <Option type="QString" value="0" name="labeling/shapeSizeX"/>
-          <Option type="QString" value="0" name="labeling/shapeSizeY"/>
-          <Option type="QString" value="0" name="labeling/shapeTransparency"/>
-          <Option type="QString" value="0" name="labeling/shapeType"/>
-          <Option type="QString" value="255" name="labeling/textColorA"/>
-          <Option type="QString" value="255" name="labeling/textColorB"/>
-          <Option type="QString" value="255" name="labeling/textColorG"/>
-          <Option type="QString" value="255" name="labeling/textColorR"/>
-          <Option type="QString" value="0" name="labeling/textTransp"/>
-          <Option type="QString" value="0" name="labeling/upsidedownLabels"/>
-          <Option type="QString" value="" name="labeling/wrapChar"/>
-          <Option type="QString" value="0" name="labeling/xOffset"/>
-          <Option type="QString" value="0" name="labeling/yOffset"/>
-          <Option type="QString" value="0" name="labeling/zIndex"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="labeling/addDirectionSymbol" value="false" type="QString"/>
+          <Option name="labeling/angleOffset" value="0" type="QString"/>
+          <Option name="labeling/blendMode" value="0" type="QString"/>
+          <Option name="labeling/bufferBlendMode" value="0" type="QString"/>
+          <Option name="labeling/bufferColorA" value="255" type="QString"/>
+          <Option name="labeling/bufferColorB" value="255" type="QString"/>
+          <Option name="labeling/bufferColorG" value="255" type="QString"/>
+          <Option name="labeling/bufferColorR" value="255" type="QString"/>
+          <Option name="labeling/bufferDraw" value="false" type="QString"/>
+          <Option name="labeling/bufferJoinStyle" value="64" type="QString"/>
+          <Option name="labeling/bufferNoFill" value="false" type="QString"/>
+          <Option name="labeling/bufferSize" value="1" type="QString"/>
+          <Option name="labeling/bufferSizeInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/bufferTransp" value="0" type="QString"/>
+          <Option name="labeling/centroidInside" value="false" type="QString"/>
+          <Option name="labeling/centroidWhole" value="false" type="QString"/>
+          <Option name="labeling/decimals" value="3" type="QString"/>
+          <Option name="labeling/displayAll" value="false" type="QString"/>
+          <Option name="labeling/dist" value="0" type="QString"/>
+          <Option name="labeling/distInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/distMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/drawLabels" value="false" type="QString"/>
+          <Option name="labeling/enabled" value="false" type="QString"/>
+          <Option name="labeling/fieldName" value="position" type="QString"/>
+          <Option name="labeling/fitInPolygonOnly" value="false" type="QString"/>
+          <Option name="labeling/fontCapitals" value="0" type="QString"/>
+          <Option name="labeling/fontFamily" value="Myriad Pro" type="QString"/>
+          <Option name="labeling/fontItalic" value="false" type="QString"/>
+          <Option name="labeling/fontLetterSpacing" value="0" type="QString"/>
+          <Option name="labeling/fontLimitPixelSize" value="false" type="QString"/>
+          <Option name="labeling/fontMaxPixelSize" value="10000" type="QString"/>
+          <Option name="labeling/fontMinPixelSize" value="3" type="QString"/>
+          <Option name="labeling/fontSize" value="10" type="QString"/>
+          <Option name="labeling/fontSizeInMapUnits" value="false" type="QString"/>
+          <Option name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/fontStrikeout" value="false" type="QString"/>
+          <Option name="labeling/fontUnderline" value="false" type="QString"/>
+          <Option name="labeling/fontWeight" value="63" type="QString"/>
+          <Option name="labeling/fontWordSpacing" value="0" type="QString"/>
+          <Option name="labeling/formatNumbers" value="false" type="QString"/>
+          <Option name="labeling/isExpression" value="false" type="QString"/>
+          <Option name="labeling/labelOffsetInMapUnits" value="true" type="QString"/>
+          <Option name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/labelPerPart" value="false" type="QString"/>
+          <Option name="labeling/leftDirectionSymbol" value="&lt;" type="QString"/>
+          <Option name="labeling/limitNumLabels" value="false" type="QString"/>
+          <Option name="labeling/maxCurvedCharAngleIn" value="20" type="QString"/>
+          <Option name="labeling/maxCurvedCharAngleOut" value="-20" type="QString"/>
+          <Option name="labeling/maxNumLabels" value="2000" type="QString"/>
+          <Option name="labeling/mergeLines" value="false" type="QString"/>
+          <Option name="labeling/minFeatureSize" value="0" type="QString"/>
+          <Option name="labeling/multilineAlign" value="0" type="QString"/>
+          <Option name="labeling/multilineHeight" value="1" type="QString"/>
+          <Option name="labeling/namedStyle" value="Semibold" type="QString"/>
+          <Option name="labeling/obstacle" value="true" type="QString"/>
+          <Option name="labeling/obstacleFactor" value="1" type="QString"/>
+          <Option name="labeling/obstacleType" value="0" type="QString"/>
+          <Option name="labeling/offsetType" value="0" type="QString"/>
+          <Option name="labeling/placeDirectionSymbol" value="0" type="QString"/>
+          <Option name="labeling/placement" value="0" type="QString"/>
+          <Option name="labeling/placementFlags" value="10" type="QString"/>
+          <Option name="labeling/plussign" value="false" type="QString"/>
+          <Option name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString"/>
+          <Option name="labeling/preserveRotation" value="true" type="QString"/>
+          <Option name="labeling/previewBkgrdColor" value="#ffffff" type="QString"/>
+          <Option name="labeling/priority" value="5" type="QString"/>
+          <Option name="labeling/quadOffset" value="4" type="QString"/>
+          <Option name="labeling/repeatDistance" value="0" type="QString"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/repeatDistanceUnit" value="1" type="QString"/>
+          <Option name="labeling/reverseDirectionSymbol" value="false" type="QString"/>
+          <Option name="labeling/rightDirectionSymbol" value=">" type="QString"/>
+          <Option name="labeling/scaleMax" value="10000000" type="QString"/>
+          <Option name="labeling/scaleMin" value="1" type="QString"/>
+          <Option name="labeling/scaleVisibility" value="false" type="QString"/>
+          <Option name="labeling/shadowBlendMode" value="6" type="QString"/>
+          <Option name="labeling/shadowColorB" value="0" type="QString"/>
+          <Option name="labeling/shadowColorG" value="0" type="QString"/>
+          <Option name="labeling/shadowColorR" value="0" type="QString"/>
+          <Option name="labeling/shadowDraw" value="false" type="QString"/>
+          <Option name="labeling/shadowOffsetAngle" value="135" type="QString"/>
+          <Option name="labeling/shadowOffsetDist" value="1" type="QString"/>
+          <Option name="labeling/shadowOffsetGlobal" value="true" type="QString"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shadowOffsetUnits" value="1" type="QString"/>
+          <Option name="labeling/shadowRadius" value="1.5" type="QString"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" value="false" type="QString"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shadowRadiusUnits" value="1" type="QString"/>
+          <Option name="labeling/shadowScale" value="100" type="QString"/>
+          <Option name="labeling/shadowTransparency" value="30" type="QString"/>
+          <Option name="labeling/shadowUnder" value="0" type="QString"/>
+          <Option name="labeling/shapeBlendMode" value="0" type="QString"/>
+          <Option name="labeling/shapeBorderColorA" value="255" type="QString"/>
+          <Option name="labeling/shapeBorderColorB" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderColorG" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderColorR" value="128" type="QString"/>
+          <Option name="labeling/shapeBorderWidth" value="0" type="QString"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeBorderWidthUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeDraw" value="true" type="QString"/>
+          <Option name="labeling/shapeFillColorA" value="255" type="QString"/>
+          <Option name="labeling/shapeFillColorB" value="138" type="QString"/>
+          <Option name="labeling/shapeFillColorG" value="0" type="QString"/>
+          <Option name="labeling/shapeFillColorR" value="101" type="QString"/>
+          <Option name="labeling/shapeJoinStyle" value="64" type="QString"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeOffsetUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeOffsetX" value="0" type="QString"/>
+          <Option name="labeling/shapeOffsetY" value="0" type="QString"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeRadiiUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeRadiiX" value="0" type="QString"/>
+          <Option name="labeling/shapeRadiiY" value="0" type="QString"/>
+          <Option name="labeling/shapeRotation" value="0" type="QString"/>
+          <Option name="labeling/shapeRotationType" value="0" type="QString"/>
+          <Option name="labeling/shapeSVGFile" value="" type="QString"/>
+          <Option name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
+          <Option name="labeling/shapeSizeType" value="0" type="QString"/>
+          <Option name="labeling/shapeSizeUnits" value="1" type="QString"/>
+          <Option name="labeling/shapeSizeX" value="0" type="QString"/>
+          <Option name="labeling/shapeSizeY" value="0" type="QString"/>
+          <Option name="labeling/shapeTransparency" value="0" type="QString"/>
+          <Option name="labeling/shapeType" value="0" type="QString"/>
+          <Option name="labeling/textColorA" value="255" type="QString"/>
+          <Option name="labeling/textColorB" value="255" type="QString"/>
+          <Option name="labeling/textColorG" value="255" type="QString"/>
+          <Option name="labeling/textColorR" value="255" type="QString"/>
+          <Option name="labeling/textTransp" value="0" type="QString"/>
+          <Option name="labeling/upsidedownLabels" value="0" type="QString"/>
+          <Option name="labeling/wrapChar" value="" type="QString"/>
+          <Option name="labeling/xOffset" value="0" type="QString"/>
+          <Option name="labeling/yOffset" value="0" type="QString"/>
+          <Option name="labeling/zIndex" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="100000" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{444d8fb8-2321-4272-9699-88b713425993}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14478,16 +12011,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="2" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14498,8 +12031,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -14508,8 +12041,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" value="false" type="bool"/>
+                <Option name="UseHtml" value="false" type="bool"/>
               </Option>
             </config>
           </editWidget>
@@ -14518,8 +12051,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" value="false" type="bool"/>
+                <Option name="UseHtml" value="false" type="bool"/>
               </Option>
             </config>
           </editWidget>
@@ -14528,8 +12061,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -14538,8 +12071,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -14569,8 +12102,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -14627,75 +12160,91 @@ def my_form_open(dialog, layer, feature):
         <alias field="csv_last_runner" index="12" name=""/>
         <alias field="csv_instructions" index="13" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="position"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="notes"/>
+        <policy policy="Duplicate" field="xyposition"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="csv_day"/>
+        <policy policy="Duplicate" field="csv_position"/>
+        <policy policy="Duplicate" field="csv_club"/>
+        <policy policy="Duplicate" field="csv_captain"/>
+        <policy policy="Duplicate" field="csv_captain_phone"/>
+        <policy policy="Duplicate" field="csv_race"/>
+        <policy policy="Duplicate" field="csv_last_runner"/>
+        <policy policy="Duplicate" field="csv_instructions"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="notes"/>
-        <default applyOnUpdate="0" expression="" field="xyposition"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="csv_day"/>
-        <default applyOnUpdate="0" expression="" field="csv_position"/>
-        <default applyOnUpdate="0" expression="" field="csv_club"/>
-        <default applyOnUpdate="0" expression="" field="csv_captain"/>
-        <default applyOnUpdate="0" expression="" field="csv_captain_phone"/>
-        <default applyOnUpdate="0" expression="" field="csv_race"/>
-        <default applyOnUpdate="0" expression="" field="csv_last_runner"/>
-        <default applyOnUpdate="0" expression="" 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_last_runner" expression="" applyOnUpdate="0"/>
+        <default field="csv_instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="position" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="notes" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="xyposition" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="csv_day" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="csv_position" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="csv_club" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="csv_captain" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="csv_captain_phone" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="csv_race" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="csv_last_runner" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="csv_instructions" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="notes" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="xyposition" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_position" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_club" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_captain" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_captain_phone" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_race" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_last_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_instructions" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="notes"/>
-        <constraint desc="" exp="" field="xyposition"/>
-        <constraint desc="" exp="" field="day"/>
-        <constraint desc="" exp="" field="csv_day"/>
-        <constraint desc="" exp="" field="csv_position"/>
-        <constraint desc="" exp="" field="csv_club"/>
-        <constraint desc="" exp="" field="csv_captain"/>
-        <constraint desc="" exp="" field="csv_captain_phone"/>
-        <constraint desc="" exp="" field="csv_race"/>
-        <constraint desc="" exp="" field="csv_last_runner"/>
-        <constraint desc="" exp="" field="csv_instructions"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="position" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="notes" exp="" desc=""/>
+        <constraint field="xyposition" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
+        <constraint field="csv_day" exp="" desc=""/>
+        <constraint field="csv_position" exp="" desc=""/>
+        <constraint field="csv_club" exp="" desc=""/>
+        <constraint field="csv_captain" exp="" desc=""/>
+        <constraint field="csv_captain_phone" exp="" desc=""/>
+        <constraint field="csv_race" exp="" desc=""/>
+        <constraint field="csv_last_runner" exp="" desc=""/>
+        <constraint field="csv_instructions" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="position"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="notes"/>
-          <column hidden="0" type="field" width="151" name="xyposition"/>
-          <column hidden="0" type="field" width="-1" name="csv_day"/>
-          <column hidden="0" type="field" width="-1" name="csv_position"/>
-          <column hidden="0" type="field" width="-1" name="csv_club"/>
-          <column hidden="0" type="field" width="-1" name="csv_captain"/>
-          <column hidden="0" type="field" width="-1" name="csv_captain_phone"/>
-          <column hidden="0" type="field" width="-1" name="csv_race"/>
-          <column hidden="0" type="field" width="-1" name="csv_last_runner"/>
-          <column hidden="0" type="field" width="-1" name="csv_instructions"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="position" width="-1" type="field" hidden="0"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="notes" width="-1" type="field" hidden="0"/>
+          <column name="xyposition" width="151" type="field" hidden="0"/>
+          <column name="csv_day" width="-1" type="field" hidden="0"/>
+          <column name="csv_position" width="-1" type="field" hidden="0"/>
+          <column name="csv_club" width="-1" type="field" hidden="0"/>
+          <column name="csv_captain" width="-1" type="field" hidden="0"/>
+          <column name="csv_captain_phone" width="-1" type="field" hidden="0"/>
+          <column name="csv_race" width="-1" type="field" hidden="0"/>
+          <column name="csv_last_runner" width="-1" type="field" hidden="0"/>
+          <column name="csv_instructions" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14727,132 +12276,132 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="csv_10_distance"/>
-        <field editable="0" name="csv_21_distance"/>
-        <field editable="0" name="csv_Description"/>
-        <field editable="1" name="csv_capt_1"/>
-        <field editable="1" name="csv_captai"/>
-        <field editable="0" name="csv_captain"/>
-        <field editable="0" name="csv_captain_email"/>
-        <field editable="0" name="csv_captain_number"/>
-        <field editable="0" name="csv_captain_phone"/>
-        <field editable="0" name="csv_club"/>
-        <field editable="0" name="csv_day"/>
-        <field editable="0" name="csv_days"/>
-        <field editable="0" name="csv_email"/>
-        <field editable="0" name="csv_first runner"/>
-        <field editable="1" name="csv_first_"/>
-        <field editable="0" name="csv_first_runner"/>
-        <field editable="0" name="csv_firstname"/>
-        <field editable="1" name="csv_instru"/>
-        <field editable="0" name="csv_instructions"/>
-        <field editable="0" name="csv_last runner"/>
-        <field editable="1" name="csv_last_r"/>
-        <field editable="0" name="csv_last_runner"/>
-        <field editable="0" name="csv_name"/>
-        <field editable="0" name="csv_phone"/>
-        <field editable="1" name="csv_positi"/>
-        <field editable="0" name="csv_position"/>
-        <field editable="0" name="csv_race"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="0" name="csv_surname"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="0" name="marshals_by_position_captain"/>
-        <field editable="0" name="marshals_by_position_captain_phone"/>
-        <field editable="0" name="marshals_by_position_club"/>
-        <field editable="0" name="marshals_by_position_day"/>
-        <field editable="0" name="marshals_by_position_first_runner"/>
-        <field editable="0" name="marshals_by_position_instructions"/>
-        <field editable="0" name="marshals_by_position_last_runner"/>
-        <field editable="0" name="marshals_by_position_position"/>
-        <field editable="0" name="marshals_by_position_race"/>
-        <field editable="1" name="notes"/>
-        <field editable="1" name="oldpositio"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="xyposition"/>
+        <field name="csv_10_distance" editable="0"/>
+        <field name="csv_21_distance" editable="0"/>
+        <field name="csv_Description" editable="0"/>
+        <field name="csv_capt_1" editable="1"/>
+        <field name="csv_captai" editable="1"/>
+        <field name="csv_captain" editable="0"/>
+        <field name="csv_captain_email" editable="0"/>
+        <field name="csv_captain_number" editable="0"/>
+        <field name="csv_captain_phone" editable="0"/>
+        <field name="csv_club" editable="0"/>
+        <field name="csv_day" editable="0"/>
+        <field name="csv_days" editable="0"/>
+        <field name="csv_email" editable="0"/>
+        <field name="csv_first runner" editable="0"/>
+        <field name="csv_first_" editable="1"/>
+        <field name="csv_first_runner" editable="0"/>
+        <field name="csv_firstname" editable="0"/>
+        <field name="csv_instru" editable="1"/>
+        <field name="csv_instructions" editable="0"/>
+        <field name="csv_last runner" editable="0"/>
+        <field name="csv_last_r" editable="1"/>
+        <field name="csv_last_runner" editable="0"/>
+        <field name="csv_name" editable="0"/>
+        <field name="csv_phone" editable="0"/>
+        <field name="csv_positi" editable="1"/>
+        <field name="csv_position" editable="0"/>
+        <field name="csv_race" editable="0"/>
+        <field name="csv_races" editable="0"/>
+        <field name="csv_surname" editable="0"/>
+        <field name="day" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="marshals_by_position_captain" editable="0"/>
+        <field name="marshals_by_position_captain_phone" editable="0"/>
+        <field name="marshals_by_position_club" editable="0"/>
+        <field name="marshals_by_position_day" editable="0"/>
+        <field name="marshals_by_position_first_runner" editable="0"/>
+        <field name="marshals_by_position_instructions" editable="0"/>
+        <field name="marshals_by_position_last_runner" editable="0"/>
+        <field name="marshals_by_position_position" editable="0"/>
+        <field name="marshals_by_position_race" editable="0"/>
+        <field name="notes" editable="1"/>
+        <field name="oldpositio" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="csv_10_distance"/>
-        <field labelOnTop="0" name="csv_21_distance"/>
-        <field labelOnTop="0" name="csv_Description"/>
-        <field labelOnTop="0" name="csv_capt_1"/>
-        <field labelOnTop="0" name="csv_captai"/>
-        <field labelOnTop="0" name="csv_captain"/>
-        <field labelOnTop="0" name="csv_captain_email"/>
-        <field labelOnTop="0" name="csv_captain_number"/>
-        <field labelOnTop="0" name="csv_captain_phone"/>
-        <field labelOnTop="0" name="csv_club"/>
-        <field labelOnTop="0" name="csv_day"/>
-        <field labelOnTop="0" name="csv_days"/>
-        <field labelOnTop="0" name="csv_email"/>
-        <field labelOnTop="0" name="csv_first runner"/>
-        <field labelOnTop="0" name="csv_first_"/>
-        <field labelOnTop="0" name="csv_first_runner"/>
-        <field labelOnTop="0" name="csv_firstname"/>
-        <field labelOnTop="0" name="csv_instru"/>
-        <field labelOnTop="0" name="csv_instructions"/>
-        <field labelOnTop="0" name="csv_last runner"/>
-        <field labelOnTop="0" name="csv_last_r"/>
-        <field labelOnTop="0" name="csv_last_runner"/>
-        <field labelOnTop="0" name="csv_name"/>
-        <field labelOnTop="0" name="csv_phone"/>
-        <field labelOnTop="0" name="csv_positi"/>
-        <field labelOnTop="0" name="csv_position"/>
-        <field labelOnTop="0" name="csv_race"/>
-        <field labelOnTop="0" name="csv_races"/>
-        <field labelOnTop="0" name="csv_surname"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="marshals_by_position_captain"/>
-        <field labelOnTop="0" name="marshals_by_position_captain_phone"/>
-        <field labelOnTop="0" name="marshals_by_position_club"/>
-        <field labelOnTop="0" name="marshals_by_position_day"/>
-        <field labelOnTop="0" name="marshals_by_position_first_runner"/>
-        <field labelOnTop="0" name="marshals_by_position_instructions"/>
-        <field labelOnTop="0" name="marshals_by_position_last_runner"/>
-        <field labelOnTop="0" name="marshals_by_position_position"/>
-        <field labelOnTop="0" name="marshals_by_position_race"/>
-        <field labelOnTop="0" name="notes"/>
-        <field labelOnTop="0" name="oldpositio"/>
-        <field labelOnTop="0" name="position"/>
-        <field labelOnTop="0" name="type"/>
-        <field labelOnTop="0" name="xyposition"/>
+        <field name="csv_10_distance" labelOnTop="0"/>
+        <field name="csv_21_distance" labelOnTop="0"/>
+        <field name="csv_Description" labelOnTop="0"/>
+        <field name="csv_capt_1" labelOnTop="0"/>
+        <field name="csv_captai" labelOnTop="0"/>
+        <field name="csv_captain" labelOnTop="0"/>
+        <field name="csv_captain_email" labelOnTop="0"/>
+        <field name="csv_captain_number" labelOnTop="0"/>
+        <field name="csv_captain_phone" labelOnTop="0"/>
+        <field name="csv_club" labelOnTop="0"/>
+        <field name="csv_day" labelOnTop="0"/>
+        <field name="csv_days" labelOnTop="0"/>
+        <field name="csv_email" labelOnTop="0"/>
+        <field name="csv_first runner" labelOnTop="0"/>
+        <field name="csv_first_" labelOnTop="0"/>
+        <field name="csv_first_runner" labelOnTop="0"/>
+        <field name="csv_firstname" labelOnTop="0"/>
+        <field name="csv_instru" labelOnTop="0"/>
+        <field name="csv_instructions" labelOnTop="0"/>
+        <field name="csv_last runner" labelOnTop="0"/>
+        <field name="csv_last_r" labelOnTop="0"/>
+        <field name="csv_last_runner" labelOnTop="0"/>
+        <field name="csv_name" labelOnTop="0"/>
+        <field name="csv_phone" labelOnTop="0"/>
+        <field name="csv_positi" labelOnTop="0"/>
+        <field name="csv_position" labelOnTop="0"/>
+        <field name="csv_race" labelOnTop="0"/>
+        <field name="csv_races" labelOnTop="0"/>
+        <field name="csv_surname" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="marshals_by_position_captain" labelOnTop="0"/>
+        <field name="marshals_by_position_captain_phone" labelOnTop="0"/>
+        <field name="marshals_by_position_club" labelOnTop="0"/>
+        <field name="marshals_by_position_day" labelOnTop="0"/>
+        <field name="marshals_by_position_first_runner" labelOnTop="0"/>
+        <field name="marshals_by_position_instructions" labelOnTop="0"/>
+        <field name="marshals_by_position_last_runner" labelOnTop="0"/>
+        <field name="marshals_by_position_position" labelOnTop="0"/>
+        <field name="marshals_by_position_race" labelOnTop="0"/>
+        <field name="notes" labelOnTop="0"/>
+        <field name="oldpositio" labelOnTop="0"/>
+        <field name="position" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+        <field name="xyposition" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="csv_captain"/>
-        <field reuseLastValue="0" name="csv_captain_email"/>
-        <field reuseLastValue="0" name="csv_captain_phone"/>
-        <field reuseLastValue="0" name="csv_club"/>
-        <field reuseLastValue="0" name="csv_day"/>
-        <field reuseLastValue="0" name="csv_days"/>
-        <field reuseLastValue="0" name="csv_email"/>
-        <field reuseLastValue="0" name="csv_first_runner"/>
-        <field reuseLastValue="0" name="csv_firstname"/>
-        <field reuseLastValue="0" name="csv_instructions"/>
-        <field reuseLastValue="0" name="csv_last_runner"/>
-        <field reuseLastValue="0" name="csv_name"/>
-        <field reuseLastValue="0" name="csv_phone"/>
-        <field reuseLastValue="0" name="csv_position"/>
-        <field reuseLastValue="0" name="csv_race"/>
-        <field reuseLastValue="0" name="csv_races"/>
-        <field reuseLastValue="0" name="csv_surname"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="marshals_by_position_captain"/>
-        <field reuseLastValue="0" name="marshals_by_position_captain_phone"/>
-        <field reuseLastValue="0" name="marshals_by_position_club"/>
-        <field reuseLastValue="0" name="marshals_by_position_day"/>
-        <field reuseLastValue="0" name="marshals_by_position_first_runner"/>
-        <field reuseLastValue="0" name="marshals_by_position_instructions"/>
-        <field reuseLastValue="0" name="marshals_by_position_last_runner"/>
-        <field reuseLastValue="0" name="marshals_by_position_position"/>
-        <field reuseLastValue="0" name="marshals_by_position_race"/>
-        <field reuseLastValue="0" name="notes"/>
-        <field reuseLastValue="0" name="position"/>
-        <field reuseLastValue="0" name="type"/>
-        <field reuseLastValue="0" name="xyposition"/>
+        <field name="csv_captain" reuseLastValue="0"/>
+        <field name="csv_captain_email" reuseLastValue="0"/>
+        <field name="csv_captain_phone" reuseLastValue="0"/>
+        <field name="csv_club" reuseLastValue="0"/>
+        <field name="csv_day" reuseLastValue="0"/>
+        <field name="csv_days" reuseLastValue="0"/>
+        <field name="csv_email" reuseLastValue="0"/>
+        <field name="csv_first_runner" reuseLastValue="0"/>
+        <field name="csv_firstname" reuseLastValue="0"/>
+        <field name="csv_instructions" reuseLastValue="0"/>
+        <field name="csv_last_runner" reuseLastValue="0"/>
+        <field name="csv_name" reuseLastValue="0"/>
+        <field name="csv_phone" reuseLastValue="0"/>
+        <field name="csv_position" reuseLastValue="0"/>
+        <field name="csv_race" reuseLastValue="0"/>
+        <field name="csv_races" reuseLastValue="0"/>
+        <field name="csv_surname" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="marshals_by_position_captain" reuseLastValue="0"/>
+        <field name="marshals_by_position_captain_phone" reuseLastValue="0"/>
+        <field name="marshals_by_position_club" reuseLastValue="0"/>
+        <field name="marshals_by_position_day" reuseLastValue="0"/>
+        <field name="marshals_by_position_first_runner" reuseLastValue="0"/>
+        <field name="marshals_by_position_instructions" reuseLastValue="0"/>
+        <field name="marshals_by_position_last_runner" reuseLastValue="0"/>
+        <field name="marshals_by_position_position" reuseLastValue="0"/>
+        <field name="marshals_by_position_race" reuseLastValue="0"/>
+        <field name="notes" reuseLastValue="0"/>
+        <field name="position" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
+        <field name="xyposition" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -14902,7 +12451,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer maxScale="100000" legendPlaceholderImage="" geometry="No geometry" autoRefreshTime="0" readOnly="0" type="vector" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" minScale="1e+08" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" wkbType="NoGeometry">
+    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" styleCategories="AllStyleCategories" readOnly="0" maxScale="100000" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="vector" geometry="No geometry" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="NoGeometry" minScale="1e+08">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -14939,6 +12488,7 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -14955,7 +12505,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14980,195 +12530,138 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="243,166,178,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="243,166,178,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="243,166,178,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="243,166,178,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="174,119,127,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="243,166,178,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="174,119,127,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="243,166,178,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="174,119,127,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{2e75a471-0eec-4801-8821-18a2e0a21c45}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="243,166,178,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="174,119,127,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="243,166,178,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="174,119,127,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="243,166,178,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="174,119,127,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15177,18 +12670,18 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="first_name"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="first_name" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -15206,8 +12699,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -15230,8 +12723,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -15254,8 +12747,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -15311,71 +12804,86 @@ def my_form_open(dialog, layer, feature):
         <alias field="last_runner" index="11" name=""/>
         <alias field="instructions" index="12" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="position"/>
+        <policy policy="Duplicate" field="first_name"/>
+        <policy policy="Duplicate" field="surname"/>
+        <policy policy="Duplicate" field="club"/>
+        <policy policy="Duplicate" field="phone"/>
+        <policy policy="Duplicate" field="email"/>
+        <policy policy="Duplicate" field="captain"/>
+        <policy policy="Duplicate" field="captain_phone"/>
+        <policy policy="Duplicate" field="race"/>
+        <policy policy="Duplicate" field="first_runner"/>
+        <policy policy="Duplicate" field="last_runner"/>
+        <policy policy="Duplicate" field="instructions"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="first_name"/>
-        <default applyOnUpdate="0" expression="" field="surname"/>
-        <default applyOnUpdate="0" expression="" field="club"/>
-        <default applyOnUpdate="0" expression="" field="phone"/>
-        <default applyOnUpdate="0" expression="" field="email"/>
-        <default applyOnUpdate="0" expression="" field="captain"/>
-        <default applyOnUpdate="0" expression="" field="captain_phone"/>
-        <default applyOnUpdate="0" expression="" field="race"/>
-        <default applyOnUpdate="0" expression="" field="first_runner"/>
-        <default applyOnUpdate="0" expression="" field="last_runner"/>
-        <default applyOnUpdate="0" expression="" field="instructions"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="first_name" expression="" applyOnUpdate="0"/>
+        <default field="surname" expression="" applyOnUpdate="0"/>
+        <default field="club" expression="" applyOnUpdate="0"/>
+        <default field="phone" expression="" applyOnUpdate="0"/>
+        <default field="email" 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="instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="position" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="first_name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="surname" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="club" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="phone" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="email" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="captain" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="captain_phone" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="race" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="first_runner" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="last_runner" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="instructions" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="first_name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="surname" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="club" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="phone" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="email" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="captain" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="captain_phone" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="race" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="first_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="last_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="instructions" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="day"/>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="first_name"/>
-        <constraint desc="" exp="" field="surname"/>
-        <constraint desc="" exp="" field="club"/>
-        <constraint desc="" exp="" field="phone"/>
-        <constraint desc="" exp="" field="email"/>
-        <constraint desc="" exp="" field="captain"/>
-        <constraint desc="" exp="" field="captain_phone"/>
-        <constraint desc="" exp="" field="race"/>
-        <constraint desc="" exp="" field="first_runner"/>
-        <constraint desc="" exp="" field="last_runner"/>
-        <constraint desc="" exp="" field="instructions"/>
+        <constraint field="day" exp="" desc=""/>
+        <constraint field="position" exp="" desc=""/>
+        <constraint field="first_name" exp="" desc=""/>
+        <constraint field="surname" exp="" desc=""/>
+        <constraint field="club" exp="" desc=""/>
+        <constraint field="phone" exp="" desc=""/>
+        <constraint field="email" exp="" desc=""/>
+        <constraint field="captain" exp="" desc=""/>
+        <constraint field="captain_phone" exp="" desc=""/>
+        <constraint field="race" exp="" desc=""/>
+        <constraint field="first_runner" exp="" desc=""/>
+        <constraint field="last_runner" exp="" desc=""/>
+        <constraint field="instructions" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="position"/>
-          <column hidden="0" type="field" width="-1" name="club"/>
-          <column hidden="0" type="field" width="-1" name="phone"/>
-          <column hidden="0" type="field" width="-1" name="email"/>
-          <column hidden="0" type="field" width="-1" name="captain"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="first_runner"/>
-          <column hidden="0" type="field" width="-1" name="last_runner"/>
-          <column hidden="0" type="field" width="-1" name="instructions"/>
-          <column hidden="0" type="field" width="-1" name="surname"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
-          <column hidden="0" type="field" width="-1" name="first_name"/>
-          <column hidden="0" type="field" width="-1" name="race"/>
-          <column hidden="0" type="field" width="-1" name="captain_phone"/>
+          <column name="position" width="-1" type="field" hidden="0"/>
+          <column name="club" width="-1" type="field" hidden="0"/>
+          <column name="phone" width="-1" type="field" hidden="0"/>
+          <column name="email" width="-1" type="field" hidden="0"/>
+          <column name="captain" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="first_runner" width="-1" type="field" hidden="0"/>
+          <column name="last_runner" width="-1" type="field" hidden="0"/>
+          <column name="instructions" width="-1" type="field" hidden="0"/>
+          <column name="surname" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="first_name" width="-1" type="field" hidden="0"/>
+          <column name="race" width="-1" type="field" hidden="0"/>
+          <column name="captain_phone" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15407,76 +12915,76 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="10_distance"/>
-        <field editable="1" name="21_distance"/>
-        <field editable="1" name="5_distance"/>
-        <field editable="1" name="captain"/>
-        <field editable="1" name="captain_email"/>
-        <field editable="1" name="captain_number"/>
-        <field editable="1" name="captain_phone"/>
-        <field editable="1" name="club"/>
-        <field editable="1" name="days"/>
-        <field editable="1" name="email"/>
-        <field editable="1" name="first_name"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="firstname"/>
-        <field editable="1" name="instructions"/>
-        <field editable="1" name="last_name"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="phone"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="surname"/>
-        <field editable="1" name="tshirt"/>
+        <field name="10_distance" editable="1"/>
+        <field name="21_distance" editable="1"/>
+        <field name="5_distance" editable="1"/>
+        <field name="captain" editable="1"/>
+        <field name="captain_email" editable="1"/>
+        <field name="captain_number" editable="1"/>
+        <field name="captain_phone" editable="1"/>
+        <field name="club" editable="1"/>
+        <field name="days" editable="1"/>
+        <field name="email" editable="1"/>
+        <field name="first_name" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="firstname" editable="1"/>
+        <field name="instructions" editable="1"/>
+        <field name="last_name" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="phone" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="surname" editable="1"/>
+        <field name="tshirt" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="10_distance"/>
-        <field labelOnTop="0" name="21_distance"/>
-        <field labelOnTop="0" name="5_distance"/>
-        <field labelOnTop="0" name="captain"/>
-        <field labelOnTop="0" name="captain_email"/>
-        <field labelOnTop="0" name="captain_number"/>
-        <field labelOnTop="0" name="captain_phone"/>
-        <field labelOnTop="0" name="club"/>
-        <field labelOnTop="0" name="days"/>
-        <field labelOnTop="0" name="email"/>
-        <field labelOnTop="0" name="first_name"/>
-        <field labelOnTop="0" name="first_runner"/>
-        <field labelOnTop="0" name="firstname"/>
-        <field labelOnTop="0" name="instructions"/>
-        <field labelOnTop="0" name="last_name"/>
-        <field labelOnTop="0" name="last_runner"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="phone"/>
-        <field labelOnTop="0" name="position"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="surname"/>
-        <field labelOnTop="0" name="tshirt"/>
+        <field name="10_distance" labelOnTop="0"/>
+        <field name="21_distance" labelOnTop="0"/>
+        <field name="5_distance" labelOnTop="0"/>
+        <field name="captain" labelOnTop="0"/>
+        <field name="captain_email" labelOnTop="0"/>
+        <field name="captain_number" labelOnTop="0"/>
+        <field name="captain_phone" labelOnTop="0"/>
+        <field name="club" labelOnTop="0"/>
+        <field name="days" labelOnTop="0"/>
+        <field name="email" labelOnTop="0"/>
+        <field name="first_name" labelOnTop="0"/>
+        <field name="first_runner" labelOnTop="0"/>
+        <field name="firstname" labelOnTop="0"/>
+        <field name="instructions" labelOnTop="0"/>
+        <field name="last_name" labelOnTop="0"/>
+        <field name="last_runner" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="phone" labelOnTop="0"/>
+        <field name="position" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="surname" labelOnTop="0"/>
+        <field name="tshirt" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="captain"/>
-        <field reuseLastValue="0" name="captain_email"/>
-        <field reuseLastValue="0" name="captain_phone"/>
-        <field reuseLastValue="0" name="club"/>
-        <field reuseLastValue="0" name="days"/>
-        <field reuseLastValue="0" name="email"/>
-        <field reuseLastValue="0" name="first_runner"/>
-        <field reuseLastValue="0" name="firstname"/>
-        <field reuseLastValue="0" name="instructions"/>
-        <field reuseLastValue="0" name="last_runner"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="phone"/>
-        <field reuseLastValue="0" name="position"/>
-        <field reuseLastValue="0" name="races"/>
-        <field reuseLastValue="0" name="surname"/>
+        <field name="captain" reuseLastValue="0"/>
+        <field name="captain_email" reuseLastValue="0"/>
+        <field name="captain_phone" reuseLastValue="0"/>
+        <field name="club" reuseLastValue="0"/>
+        <field name="days" reuseLastValue="0"/>
+        <field name="email" reuseLastValue="0"/>
+        <field name="first_runner" reuseLastValue="0"/>
+        <field name="firstname" reuseLastValue="0"/>
+        <field name="instructions" reuseLastValue="0"/>
+        <field name="last_runner" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="phone" reuseLastValue="0"/>
+        <field name="position" reuseLastValue="0"/>
+        <field name="races" reuseLastValue="0"/>
+        <field name="surname" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -15525,23 +13033,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15566,476 +13075,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="141,90,153,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="141,90,153,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="141,90,153,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{5970f832-e8d3-481a-8cf9-9744ea98d012}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="141,90,153,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="101,64,109,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="141,90,153,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="101,64,109,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="141,90,153,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="101,64,109,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{8d4290c3-b722-4503-bba9-f0f83dceef08}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="141,90,153,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="101,64,109,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="141,90,153,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="101,64,109,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="141,90,153,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="101,64,109,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car"/>
-          <rule symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking"/>
+          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" label="Car"/>
+          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" label="Walking"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{743d2826-031c-45d5-809e-09f032abdd16}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="123,211,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="1" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="123,211,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="123,211,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="1" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="flat" name="capstyle"/>
-                <Option type="QString" value="4;1;1;1" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="103,34,144,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="1.25" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="1" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="4;1;1;1" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1.25" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="flat" k="capstyle"/>
-              <prop v="4;1;1;1" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1.25" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@1@1" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="103,34,144,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="5" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="5" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@1@1@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{03389801-e1b4-43c1-bed5-409ab2a31647}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="103,34,144,255" name="color"/>
-                        <Option type="QString" value="miter" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="no" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="miter" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -16048,93 +13407,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="id" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" italic="1" style="0" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16142,16 +13474,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16177,27 +13509,31 @@ def my_form_open(dialog, layer, feature):
         <alias field="id" index="0" name=""/>
         <alias field="type" index="1" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="type"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16229,12 +13565,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16242,7 +13578,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="Point" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" refreshOnNotifyMessage="" geometry="Point" styleCategories="AllStyleCategories">
+    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -16291,23 +13627,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16332,429 +13669,334 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="232,113,141,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="232,113,141,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="232,113,141,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="232,113,141,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="166,81,101,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="232,113,141,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="166,81,101,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="232,113,141,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="166,81,101,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="232,113,141,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="166,81,101,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="232,113,141,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="166,81,101,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="232,113,141,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="166,81,101,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Regular" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.75" fontWordSpacing="0" textOrientation="horizontal" fontSize="8.5" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="0.75" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="name" fontSize="8.5" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1.5" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSize="1.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="LabelRotation">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
-                    <Option type="int" value="3" name="type"/>
+                <Option name="name" value="" type="QString"/>
+                <Option name="properties" type="Map">
+                  <Option name="LabelRotation" type="Map">
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
-                  <Option type="Map" name="PositionX">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="label_x" name="field"/>
-                    <Option type="int" value="2" name="type"/>
+                  <Option name="PositionX" type="Map">
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="field" value="label_x" type="QString"/>
+                    <Option name="type" value="2" type="int"/>
                   </Option>
-                  <Option type="Map" name="PositionY">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="label_y" name="field"/>
-                    <Option type="int" value="2" name="type"/>
+                  <Option name="PositionY" type="Map">
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="field" value="label_y" type="QString"/>
+                    <Option name="type" value="2" type="int"/>
                   </Option>
-                  <Option type="Map" name="Size">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression"/>
-                    <Option type="int" value="3" name="type"/>
+                  <Option name="Size" type="Map">
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                 </Option>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-          <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="1" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-          <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="0.20000000000000001" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="1" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="2" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+          <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="0.20000000000000001" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="LabelRotation" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="label_x" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="PositionX" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="label_x" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="label_y" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="PositionY" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="label_y" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-              <Option type="int" value="0" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-              <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-              <Option type="double" value="0" name="minLength"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-              <Option type="QString" value="MM" name="minLengthUnit"/>
-              <Option type="double" value="0" name="offsetFromAnchor"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-              <Option type="double" value="0" name="offsetFromLabel"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="&quot;name&quot;" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="&quot;name&quot;" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="100000" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16762,16 +14004,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="2" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16782,8 +14024,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16792,8 +14034,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16802,8 +14044,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16812,8 +14054,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16822,8 +14064,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16832,8 +14074,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16842,8 +14084,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16852,8 +14094,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16862,8 +14104,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -16880,55 +14122,66 @@ def my_form_open(dialog, layer, feature):
         <alias field="label_y" index="7" name=""/>
         <alias field="label_rota" index="8" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="osm_id"/>
+        <policy policy="Duplicate" field="name"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="z_order"/>
+        <policy policy="Duplicate" field="population"/>
+        <policy policy="Duplicate" field="label_x"/>
+        <policy policy="Duplicate" field="label_y"/>
+        <policy policy="Duplicate" field="label_rota"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="osm_id"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="z_order"/>
-        <default applyOnUpdate="0" expression="" field="population"/>
-        <default applyOnUpdate="0" expression="" field="label_x"/>
-        <default applyOnUpdate="0" expression="" field="label_y"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="osm_id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="z_order" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="population" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="label_x" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="label_y" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="label_rota" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="osm_id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="z_order" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="population" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_x" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_y" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_rota" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="osm_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="z_order"/>
-        <constraint desc="" exp="" field="population"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rota"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="osm_id" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="z_order" exp="" desc=""/>
+        <constraint field="population" exp="" desc=""/>
+        <constraint field="label_x" exp="" desc=""/>
+        <constraint field="label_y" exp="" desc=""/>
+        <constraint field="label_rota" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="osm_id"/>
-          <column hidden="0" type="field" width="-1" name="name"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="0" type="field" width="-1" name="z_order"/>
-          <column hidden="0" type="field" width="-1" name="population"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="label_x"/>
-          <column hidden="0" type="field" width="-1" name="label_y"/>
-          <column hidden="0" type="field" width="-1" name="label_rota"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="osm_id" width="-1" type="field" hidden="0"/>
+          <column name="name" width="-1" type="field" hidden="0"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="z_order" width="-1" type="field" hidden="0"/>
+          <column name="population" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="label_x" width="-1" type="field" hidden="0"/>
+          <column name="label_y" width="-1" type="field" hidden="0"/>
+          <column name="label_rota" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16960,26 +14213,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="population"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="z_order"/>
+        <field name="id" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="osm_id" editable="1"/>
+        <field name="population" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label_rota"/>
-        <field labelOnTop="0" name="label_x"/>
-        <field labelOnTop="0" name="label_y"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="osm_id"/>
-        <field labelOnTop="0" name="population"/>
-        <field labelOnTop="0" name="type"/>
-        <field labelOnTop="0" name="z_order"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label_rota" labelOnTop="0"/>
+        <field name="label_x" labelOnTop="0"/>
+        <field name="label_y" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="osm_id" labelOnTop="0"/>
+        <field name="population" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+        <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16987,7 +14240,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -17036,23 +14289,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17077,496 +14331,382 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="255,158,23,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="255,158,23,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,158,23,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,158,23,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="182,113,16,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,158,23,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="182,113,16,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,158,23,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="182,113,16,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{354d4d11-8126-426c-b325-0776a64e32e3}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="255,158,23,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="182,113,16,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="255,158,23,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="182,113,16,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="255,158,23,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="182,113,16,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Regular" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.80000000000000004" fontWordSpacing="0" textOrientation="horizontal" fontSize="7" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="0.80000000000000004" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSize="7" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="1" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="196,60,57,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="2" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="196,60,57,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="2" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="196,60,57,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="0" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-          <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="3" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="LineGeometry" repeatDistanceUnits="MapUnit" repeatDistance="0" placementFlags="4" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="3" offsetType="0" centroidWhole="0" allowDegraded="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-          <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="5" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="0.29999999999999999" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="1"/>
+          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="3" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" placement="3" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="4" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+          <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="1" obstacleFactor="0.29999999999999999" minFeatureSize="5" drawLabels="1" obstacleType="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="AlwaysShow">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="always_sho" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="AlwaysShow" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="always_sho" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="IsObstacle">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="&quot;&quot;" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="IsObstacle" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="&quot;&quot;" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="LabelRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="LabelRotation" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="label_x" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="PositionX" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="label_x" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="label_y" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="PositionY" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="label_y" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="Priority">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                <Option name="Priority" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
-                <Option type="Map" name="Show">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="auxiliary_storage_labeling_show" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="Show" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="auxiliary_storage_labeling_show" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-              <Option type="int" value="0" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-              <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-              <Option type="double" value="0" name="minLength"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-              <Option type="QString" value="MM" name="minLengthUnit"/>
-              <Option type="double" value="0" name="offsetFromAnchor"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-              <Option type="double" value="0" name="offsetFromLabel"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="100000" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17574,16 +14714,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="2" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17594,8 +14734,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -17604,8 +14744,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -17649,8 +14789,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -17730,83 +14870,101 @@ def my_form_open(dialog, layer, feature):
         <alias field="resident_a" index="14" name=""/>
         <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="osm_id"/>
+        <policy policy="Duplicate" field="name"/>
+        <policy policy="Duplicate" field="highway"/>
+        <policy policy="Duplicate" field="waterway"/>
+        <policy policy="Duplicate" field="aerialway"/>
+        <policy policy="Duplicate" field="barrier"/>
+        <policy policy="Duplicate" field="man_made"/>
+        <policy policy="Duplicate" field="z_order"/>
+        <policy policy="Duplicate" field="other_tags"/>
+        <policy policy="Duplicate" field="never_show"/>
+        <policy policy="Duplicate" field="label_x"/>
+        <policy policy="Duplicate" field="label_y"/>
+        <policy policy="Duplicate" field="label_rota"/>
+        <policy policy="Duplicate" field="always_sho"/>
+        <policy policy="Duplicate" field="resident_a"/>
+        <policy policy="Duplicate" field="auxiliary_storage_labeling_show"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="osm_id"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="highway"/>
-        <default applyOnUpdate="0" expression="" field="waterway"/>
-        <default applyOnUpdate="0" expression="" field="aerialway"/>
-        <default applyOnUpdate="0" expression="" field="barrier"/>
-        <default applyOnUpdate="0" expression="" field="man_made"/>
-        <default applyOnUpdate="0" expression="" field="z_order"/>
-        <default applyOnUpdate="0" expression="" field="other_tags"/>
-        <default applyOnUpdate="0" expression="" field="never_show"/>
-        <default applyOnUpdate="0" expression="" field="label_x"/>
-        <default applyOnUpdate="0" expression="" field="label_y"/>
-        <default applyOnUpdate="0" expression="" field="label_rota"/>
-        <default applyOnUpdate="0" expression="" field="always_sho"/>
-        <default applyOnUpdate="0" expression="" field="resident_a"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="osm_id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="highway" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="waterway" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="aerialway" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="barrier" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="man_made" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="z_order" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="other_tags" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="never_show" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="label_x" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="label_y" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="label_rota" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="always_sho" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="resident_a" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="auxiliary_storage_labeling_show" exp_strength="0"/>
+        <constraint unique_strength="0" field="osm_id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="highway" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="waterway" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="aerialway" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="barrier" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="man_made" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="z_order" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="other_tags" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="never_show" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_x" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_y" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_rota" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="always_sho" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="resident_a" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="auxiliary_storage_labeling_show" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="osm_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="highway"/>
-        <constraint desc="" exp="" field="waterway"/>
-        <constraint desc="" exp="" field="aerialway"/>
-        <constraint desc="" exp="" field="barrier"/>
-        <constraint desc="" exp="" field="man_made"/>
-        <constraint desc="" exp="" field="z_order"/>
-        <constraint desc="" exp="" field="other_tags"/>
-        <constraint desc="" exp="" field="never_show"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rota"/>
-        <constraint desc="" exp="" field="always_sho"/>
-        <constraint desc="" exp="" field="resident_a"/>
-        <constraint desc="" exp="" field="auxiliary_storage_labeling_show"/>
+        <constraint field="osm_id" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="highway" exp="" desc=""/>
+        <constraint field="waterway" exp="" desc=""/>
+        <constraint field="aerialway" exp="" desc=""/>
+        <constraint field="barrier" exp="" desc=""/>
+        <constraint field="man_made" exp="" desc=""/>
+        <constraint field="z_order" exp="" desc=""/>
+        <constraint field="other_tags" exp="" desc=""/>
+        <constraint field="never_show" exp="" desc=""/>
+        <constraint field="label_x" exp="" desc=""/>
+        <constraint field="label_y" exp="" desc=""/>
+        <constraint field="label_rota" exp="" desc=""/>
+        <constraint field="always_sho" exp="" desc=""/>
+        <constraint field="resident_a" exp="" desc=""/>
+        <constraint field="auxiliary_storage_labeling_show" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;osm_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="osm_id"/>
-          <column hidden="0" type="field" width="160" name="name"/>
-          <column hidden="0" type="field" width="-1" name="z_order"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="highway"/>
-          <column hidden="0" type="field" width="-1" name="waterway"/>
-          <column hidden="0" type="field" width="-1" name="aerialway"/>
-          <column hidden="0" type="field" width="-1" name="barrier"/>
-          <column hidden="0" type="field" width="-1" name="man_made"/>
-          <column hidden="0" type="field" width="142" name="other_tags"/>
-          <column hidden="0" type="field" width="-1" name="never_show"/>
-          <column hidden="0" type="field" width="-1" name="label_x"/>
-          <column hidden="0" type="field" width="-1" name="label_y"/>
-          <column hidden="0" type="field" width="-1" name="label_rota"/>
-          <column hidden="0" type="field" width="-1" name="always_sho"/>
-          <column hidden="0" type="field" width="-1" name="resident_a"/>
-          <column hidden="0" type="field" width="-1" name="auxiliary_storage_labeling_show"/>
+          <column name="osm_id" width="-1" type="field" hidden="0"/>
+          <column name="name" width="160" type="field" hidden="0"/>
+          <column name="z_order" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="highway" width="-1" type="field" hidden="0"/>
+          <column name="waterway" width="-1" type="field" hidden="0"/>
+          <column name="aerialway" width="-1" type="field" hidden="0"/>
+          <column name="barrier" width="-1" type="field" hidden="0"/>
+          <column name="man_made" width="-1" type="field" hidden="0"/>
+          <column name="other_tags" width="142" type="field" hidden="0"/>
+          <column name="never_show" width="-1" type="field" hidden="0"/>
+          <column name="label_x" width="-1" type="field" hidden="0"/>
+          <column name="label_y" width="-1" type="field" hidden="0"/>
+          <column name="label_rota" width="-1" type="field" hidden="0"/>
+          <column name="always_sho" width="-1" type="field" hidden="0"/>
+          <column name="resident_a" width="-1" type="field" hidden="0"/>
+          <column name="auxiliary_storage_labeling_show" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17838,94 +14996,94 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="aerialway"/>
-        <field editable="1" name="always_sho"/>
-        <field editable="0" name="auxiliary_storage_labeling_show"/>
-        <field editable="1" name="barrier"/>
-        <field editable="1" name="highway"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="man_made"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="never_show"/>
-        <field editable="0" name="orig_access"/>
-        <field editable="0" name="orig_always_sho"/>
-        <field editable="0" name="orig_bridge"/>
-        <field editable="0" name="orig_c_z_order"/>
-        <field editable="0" name="orig_class"/>
-        <field editable="0" name="orig_id"/>
-        <field editable="0" name="orig_label_rota"/>
-        <field editable="0" name="orig_label_x"/>
-        <field editable="0" name="orig_label_y"/>
-        <field editable="0" name="orig_name"/>
-        <field editable="0" name="orig_oneway"/>
-        <field editable="0" name="orig_ref"/>
-        <field editable="0" name="orig_service"/>
-        <field editable="0" name="orig_show"/>
-        <field editable="0" name="orig_tunnel"/>
-        <field editable="0" name="orig_type"/>
-        <field editable="0" name="orig_z_order"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="other_tags"/>
-        <field editable="1" name="resident_a"/>
-        <field editable="1" name="resident_access"/>
-        <field editable="1" name="waterway"/>
-        <field editable="1" name="z_order"/>
+        <field name="aerialway" editable="1"/>
+        <field name="always_sho" editable="1"/>
+        <field name="auxiliary_storage_labeling_show" editable="0"/>
+        <field name="barrier" editable="1"/>
+        <field name="highway" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="man_made" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="never_show" editable="1"/>
+        <field name="orig_access" editable="0"/>
+        <field name="orig_always_sho" editable="0"/>
+        <field name="orig_bridge" editable="0"/>
+        <field name="orig_c_z_order" editable="0"/>
+        <field name="orig_class" editable="0"/>
+        <field name="orig_id" editable="0"/>
+        <field name="orig_label_rota" editable="0"/>
+        <field name="orig_label_x" editable="0"/>
+        <field name="orig_label_y" editable="0"/>
+        <field name="orig_name" editable="0"/>
+        <field name="orig_oneway" editable="0"/>
+        <field name="orig_ref" editable="0"/>
+        <field name="orig_service" editable="0"/>
+        <field name="orig_show" editable="0"/>
+        <field name="orig_tunnel" editable="0"/>
+        <field name="orig_type" editable="0"/>
+        <field name="orig_z_order" editable="0"/>
+        <field name="osm_id" editable="1"/>
+        <field name="other_tags" editable="1"/>
+        <field name="resident_a" editable="1"/>
+        <field name="resident_access" editable="1"/>
+        <field name="waterway" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="aerialway"/>
-        <field labelOnTop="0" name="always_sho"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_show"/>
-        <field labelOnTop="0" name="barrier"/>
-        <field labelOnTop="0" name="highway"/>
-        <field labelOnTop="0" name="label_rota"/>
-        <field labelOnTop="0" name="label_x"/>
-        <field labelOnTop="0" name="label_y"/>
-        <field labelOnTop="0" name="man_made"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="never_show"/>
-        <field labelOnTop="0" name="orig_access"/>
-        <field labelOnTop="0" name="orig_always_sho"/>
-        <field labelOnTop="0" name="orig_bridge"/>
-        <field labelOnTop="0" name="orig_c_z_order"/>
-        <field labelOnTop="0" name="orig_class"/>
-        <field labelOnTop="0" name="orig_id"/>
-        <field labelOnTop="0" name="orig_label_rota"/>
-        <field labelOnTop="0" name="orig_label_x"/>
-        <field labelOnTop="0" name="orig_label_y"/>
-        <field labelOnTop="0" name="orig_name"/>
-        <field labelOnTop="0" name="orig_oneway"/>
-        <field labelOnTop="0" name="orig_ref"/>
-        <field labelOnTop="0" name="orig_service"/>
-        <field labelOnTop="0" name="orig_show"/>
-        <field labelOnTop="0" name="orig_tunnel"/>
-        <field labelOnTop="0" name="orig_type"/>
-        <field labelOnTop="0" name="orig_z_order"/>
-        <field labelOnTop="0" name="osm_id"/>
-        <field labelOnTop="0" name="other_tags"/>
-        <field labelOnTop="0" name="resident_a"/>
-        <field labelOnTop="0" name="resident_access"/>
-        <field labelOnTop="0" name="waterway"/>
-        <field labelOnTop="0" name="z_order"/>
+        <field name="aerialway" labelOnTop="0"/>
+        <field name="always_sho" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_show" labelOnTop="0"/>
+        <field name="barrier" labelOnTop="0"/>
+        <field name="highway" labelOnTop="0"/>
+        <field name="label_rota" labelOnTop="0"/>
+        <field name="label_x" labelOnTop="0"/>
+        <field name="label_y" labelOnTop="0"/>
+        <field name="man_made" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="never_show" labelOnTop="0"/>
+        <field name="orig_access" labelOnTop="0"/>
+        <field name="orig_always_sho" labelOnTop="0"/>
+        <field name="orig_bridge" labelOnTop="0"/>
+        <field name="orig_c_z_order" labelOnTop="0"/>
+        <field name="orig_class" labelOnTop="0"/>
+        <field name="orig_id" labelOnTop="0"/>
+        <field name="orig_label_rota" labelOnTop="0"/>
+        <field name="orig_label_x" labelOnTop="0"/>
+        <field name="orig_label_y" labelOnTop="0"/>
+        <field name="orig_name" labelOnTop="0"/>
+        <field name="orig_oneway" labelOnTop="0"/>
+        <field name="orig_ref" labelOnTop="0"/>
+        <field name="orig_service" labelOnTop="0"/>
+        <field name="orig_show" labelOnTop="0"/>
+        <field name="orig_tunnel" labelOnTop="0"/>
+        <field name="orig_type" labelOnTop="0"/>
+        <field name="orig_z_order" labelOnTop="0"/>
+        <field name="osm_id" labelOnTop="0"/>
+        <field name="other_tags" labelOnTop="0"/>
+        <field name="resident_a" labelOnTop="0"/>
+        <field name="resident_access" labelOnTop="0"/>
+        <field name="waterway" labelOnTop="0"/>
+        <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="aerialway"/>
-        <field reuseLastValue="0" name="always_sho"/>
-        <field reuseLastValue="0" name="auxiliary_storage_labeling_show"/>
-        <field reuseLastValue="0" name="barrier"/>
-        <field reuseLastValue="0" name="highway"/>
-        <field reuseLastValue="0" name="label_rota"/>
-        <field reuseLastValue="0" name="label_x"/>
-        <field reuseLastValue="0" name="label_y"/>
-        <field reuseLastValue="0" name="man_made"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="never_show"/>
-        <field reuseLastValue="0" name="osm_id"/>
-        <field reuseLastValue="0" name="other_tags"/>
-        <field reuseLastValue="0" name="resident_a"/>
-        <field reuseLastValue="0" name="waterway"/>
-        <field reuseLastValue="0" name="z_order"/>
+        <field name="aerialway" reuseLastValue="0"/>
+        <field name="always_sho" reuseLastValue="0"/>
+        <field name="auxiliary_storage_labeling_show" reuseLastValue="0"/>
+        <field name="barrier" reuseLastValue="0"/>
+        <field name="highway" reuseLastValue="0"/>
+        <field name="label_rota" reuseLastValue="0"/>
+        <field name="label_x" reuseLastValue="0"/>
+        <field name="label_y" reuseLastValue="0"/>
+        <field name="man_made" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="never_show" reuseLastValue="0"/>
+        <field name="osm_id" reuseLastValue="0"/>
+        <field name="other_tags" reuseLastValue="0"/>
+        <field name="resident_a" reuseLastValue="0"/>
+        <field name="waterway" reuseLastValue="0"/>
+        <field name="z_order" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -17975,7 +15133,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="Point" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Point" styleCategories="AllStyleCategories">
+    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -18024,23 +15182,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18065,741 +15224,511 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="231,113,72,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="231,113,72,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="231,113,72,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="231,113,72,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="165,81,51,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="231,113,72,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="165,81,51,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="231,113,72,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="165,81,51,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{1c5aec7e-4c77-4262-a06c-203b26daec78}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="231,113,72,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="165,81,51,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="231,113,72,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="165,81,51,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="231,113,72,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="165,81,51,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
-          <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
-          <rule symbol="2" filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
-          <rule symbol="3" filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
-          <rule symbol="4" filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
-          <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
+          <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}" symbol="0"/>
+          <rule filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" symbol="1"/>
+          <rule filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" symbol="2"/>
+          <rule filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}" symbol="3"/>
+          <rule filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" symbol="4"/>
+          <rule filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="star" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.5" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="7" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="name" value="star" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.5" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="7" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="star" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.5" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="7" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '14', '7' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '14', '7' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="1" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+            <layer id="{74e7b734-0e1a-432e-bf3d-32d79041a365}" locked="0" enabled="1" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="0,32,80,255" name="color"/>
-                <Option type="QString" value="0" name="fixedAspectRatio"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="amenity/amenity_toilets.svg" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="0,32,80,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="amenity/amenity_toilets.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="7" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="7" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="0,32,80,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="amenity/amenity_toilets.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="" k="parameters"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="7" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="2" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+            <layer id="{38428a6a-34c4-41de-a5a9-70586b4b9787}" locked="0" enabled="1" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="0" name="fixedAspectRatio"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="../images/gym-bag.svg" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="../images/gym-bag.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="6" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="6" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="../images/gym-bag.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="" k="parameters"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="3" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+            <layer id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}" locked="0" enabled="1" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="125,139,143,255" name="color"/>
-                <Option type="QString" value="0" name="fixedAspectRatio"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="../images/road_closure.svg" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="../images/road_closure.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="6" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="6" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="125,139,143,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="../images/road_closure.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="" k="parameters"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '6' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '6' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="4" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="4" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+            <layer id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}" locked="0" enabled="1" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="0,12,254,255" name="color"/>
-                <Option type="QString" value="0" name="fixedAspectRatio"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="transport/transport_bus_stop.svg" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="255,255,255,255" name="outline_color"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="0,12,254,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="transport/transport_bus_stop.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="255,255,255,255" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="5" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="0,12,254,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="transport/transport_bus_stop.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="255,255,255,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="" k="parameters"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option type="QString" value="13" name="blend_mode"/>
-                    <Option type="QString" value="2.645" name="blur_level"/>
-                    <Option type="QString" value="MM" name="blur_unit"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                    <Option type="QString" value="0,0,0,255" name="color"/>
-                    <Option type="QString" value="2" name="draw_mode"/>
-                    <Option type="QString" value="0" name="enabled"/>
-                    <Option type="QString" value="135" name="offset_angle"/>
-                    <Option type="QString" value="2" name="offset_distance"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                    <Option type="QString" value="1" name="opacity"/>
+                    <Option name="blend_mode" value="13" type="QString"/>
+                    <Option name="blur_level" value="2.645" type="QString"/>
+                    <Option name="blur_unit" value="MM" type="QString"/>
+                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="offset_angle" value="135" type="QString"/>
+                    <Option name="offset_distance" value="2" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="offset_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="opacity" value="1" type="QString"/>
                   </Option>
-                  <prop v="13" k="blend_mode"/>
-                  <prop v="2.645" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="135" k="offset_angle"/>
-                  <prop v="2" k="offset_distance"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                  <prop v="1" k="opacity"/>
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="blend_mode"/>
-                    <Option type="QString" value="0.7935" name="blur_level"/>
-                    <Option type="QString" value="MM" name="blur_unit"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                    <Option type="QString" value="0,0,255,255" name="color1"/>
-                    <Option type="QString" value="0,255,0,255" name="color2"/>
-                    <Option type="QString" value="0" name="color_type"/>
-                    <Option type="QString" value="ccw" name="direction"/>
-                    <Option type="QString" value="0" name="discrete"/>
-                    <Option type="QString" value="2" name="draw_mode"/>
-                    <Option type="QString" value="1" name="enabled"/>
-                    <Option type="QString" value="0.5" name="opacity"/>
-                    <Option type="QString" value="gradient" name="rampType"/>
-                    <Option type="QString" value="255,255,255,255" name="single_color"/>
-                    <Option type="QString" value="rgb" name="spec"/>
-                    <Option type="QString" value="2" name="spread"/>
-                    <Option type="QString" value="MM" name="spread_unit"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                    <Option name="blend_mode" value="0" type="QString"/>
+                    <Option name="blur_level" value="0.7935" type="QString"/>
+                    <Option name="blur_unit" value="MM" type="QString"/>
+                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color1" value="0,0,255,255" type="QString"/>
+                    <Option name="color2" value="0,255,0,255" type="QString"/>
+                    <Option name="color_type" value="0" type="QString"/>
+                    <Option name="direction" value="ccw" type="QString"/>
+                    <Option name="discrete" value="0" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="1" type="QString"/>
+                    <Option name="opacity" value="0.5" type="QString"/>
+                    <Option name="rampType" value="gradient" type="QString"/>
+                    <Option name="single_color" value="255,255,255,255" type="QString"/>
+                    <Option name="spec" value="rgb" type="QString"/>
+                    <Option name="spread" value="2" type="QString"/>
+                    <Option name="spread_unit" value="MM" type="QString"/>
+                    <Option name="spread_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   </Option>
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="0.7935" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,255,255" k="color1"/>
-                  <prop v="0,255,0,255" k="color2"/>
-                  <prop v="0" k="color_type"/>
-                  <prop v="ccw" k="direction"/>
-                  <prop v="0" k="discrete"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="1" k="enabled"/>
-                  <prop v="0.5" k="opacity"/>
-                  <prop v="gradient" k="rampType"/>
-                  <prop v="255,255,255,255" k="single_color"/>
-                  <prop v="rgb" k="spec"/>
-                  <prop v="2" k="spread"/>
-                  <prop v="MM" k="spread_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="blend_mode"/>
-                    <Option type="QString" value="2" name="draw_mode"/>
-                    <Option type="QString" value="1" name="enabled"/>
-                    <Option type="QString" value="1" name="opacity"/>
+                    <Option name="blend_mode" value="0" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="1" type="QString"/>
+                    <Option name="opacity" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="1" k="enabled"/>
-                  <prop v="1" k="opacity"/>
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option type="QString" value="13" name="blend_mode"/>
-                    <Option type="QString" value="2.645" name="blur_level"/>
-                    <Option type="QString" value="MM" name="blur_unit"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                    <Option type="QString" value="0,0,0,255" name="color"/>
-                    <Option type="QString" value="2" name="draw_mode"/>
-                    <Option type="QString" value="0" name="enabled"/>
-                    <Option type="QString" value="135" name="offset_angle"/>
-                    <Option type="QString" value="2" name="offset_distance"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                    <Option type="QString" value="1" name="opacity"/>
+                    <Option name="blend_mode" value="13" type="QString"/>
+                    <Option name="blur_level" value="2.645" type="QString"/>
+                    <Option name="blur_unit" value="MM" type="QString"/>
+                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="0,0,0,255" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="offset_angle" value="135" type="QString"/>
+                    <Option name="offset_distance" value="2" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="offset_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="opacity" value="1" type="QString"/>
                   </Option>
-                  <prop v="13" k="blend_mode"/>
-                  <prop v="2.645" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="135" k="offset_angle"/>
-                  <prop v="2" k="offset_distance"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                  <prop v="1" k="opacity"/>
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="blend_mode"/>
-                    <Option type="QString" value="0.7935" name="blur_level"/>
-                    <Option type="QString" value="MM" name="blur_unit"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                    <Option type="QString" value="0,0,255,255" name="color1"/>
-                    <Option type="QString" value="0,255,0,255" name="color2"/>
-                    <Option type="QString" value="0" name="color_type"/>
-                    <Option type="QString" value="ccw" name="direction"/>
-                    <Option type="QString" value="0" name="discrete"/>
-                    <Option type="QString" value="2" name="draw_mode"/>
-                    <Option type="QString" value="0" name="enabled"/>
-                    <Option type="QString" value="0.5" name="opacity"/>
-                    <Option type="QString" value="gradient" name="rampType"/>
-                    <Option type="QString" value="255,255,255,255" name="single_color"/>
-                    <Option type="QString" value="rgb" name="spec"/>
-                    <Option type="QString" value="2" name="spread"/>
-                    <Option type="QString" value="MM" name="spread_unit"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                    <Option name="blend_mode" value="0" type="QString"/>
+                    <Option name="blur_level" value="0.7935" type="QString"/>
+                    <Option name="blur_unit" value="MM" type="QString"/>
+                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color1" value="0,0,255,255" type="QString"/>
+                    <Option name="color2" value="0,255,0,255" type="QString"/>
+                    <Option name="color_type" value="0" type="QString"/>
+                    <Option name="direction" value="ccw" type="QString"/>
+                    <Option name="discrete" value="0" type="QString"/>
+                    <Option name="draw_mode" value="2" type="QString"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="opacity" value="0.5" type="QString"/>
+                    <Option name="rampType" value="gradient" type="QString"/>
+                    <Option name="single_color" value="255,255,255,255" type="QString"/>
+                    <Option name="spec" value="rgb" type="QString"/>
+                    <Option name="spread" value="2" type="QString"/>
+                    <Option name="spread_unit" value="MM" type="QString"/>
+                    <Option name="spread_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   </Option>
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="0.7935" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,255,255" k="color1"/>
-                  <prop v="0,255,0,255" k="color2"/>
-                  <prop v="0" k="color_type"/>
-                  <prop v="ccw" k="direction"/>
-                  <prop v="0" k="discrete"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="0.5" k="opacity"/>
-                  <prop v="gradient" k="rampType"/>
-                  <prop v="255,255,255,255" k="single_color"/>
-                  <prop v="rgb" k="spec"/>
-                  <prop v="2" k="spread"/>
-                  <prop v="MM" k="spread_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
                 </effect>
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="5" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="5" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+            <layer id="{810b6ab6-d667-41dd-991f-1013e4243a85}" locked="0" enabled="1" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="43,153,41,255" name="color"/>
-                <Option type="QString" value="0" name="fixedAspectRatio"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="transport/amenity=parking.svg" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="color" value="43,153,41,255" type="QString"/>
+                <Option name="fixedAspectRatio" value="0" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="name" value="transport/amenity=parking.svg" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
                 <Option name="parameters"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="6" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="6" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="43,153,41,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="transport/amenity=parking.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="" k="parameters"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -18808,221 +15737,183 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="name" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="0" bufferSize="2" bufferColor="255,255,255,255" bufferOpacity="0.80000000000000004" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="1" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="0.69999999999999996" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="2" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="2" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="1">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferSize="2" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="2" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="0.69999999999999996" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="2" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="LabelDistance">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="if( @map_scale &lt; 7000, '5', '3' )" name="expression"/>
-                    <Option type="int" value="3" name="type"/>
+                <Option name="name" value="" type="QString"/>
+                <Option name="properties" type="Map">
+                  <Option name="LabelDistance" type="Map">
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="if( @map_scale &lt; 7000, '5', '3' )" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
-                  <Option type="Map" name="OffsetQuad">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="2" name="expression"/>
-                    <Option type="int" value="3" name="type"/>
+                  <Option name="OffsetQuad" type="Map">
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="2" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
-                  <Option type="Map" name="Size">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="if( @map_scale &lt; 7000, '14', '10' )" name="expression"/>
-                    <Option type="int" value="3" name="type"/>
+                  <Option name="Size" type="Map">
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="if( @map_scale &lt; 7000, '14', '10' )" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                 </Option>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-          <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MM" priority="10" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="2" geometryGeneratorEnabled="0" quadOffset="2" placement="0" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="3"/>
-          <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="10" upsidedownLabels="0" obstacleFactor="1.8" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="3" xOffset="2" priority="10" yOffset="3" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+          <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="10" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1.8" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelDistance">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="if( @map_scale &lt; 7000, '5', '3' )" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="LabelDistance" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="if( @map_scale &lt; 7000, '5', '3' )" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="OffsetQuad">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="2" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="OffsetQuad" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="2" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="if( @map_scale &lt; 7000, '14', '10' )" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="if( @map_scale &lt; 7000, '14', '10' )" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-              <Option type="int" value="0" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-              <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-              <Option type="double" value="0" name="minLength"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-              <Option type="QString" value="MM" name="minLengthUnit"/>
-              <Option type="double" value="0" name="offsetFromAnchor"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-              <Option type="double" value="0" name="offsetFromLabel"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="id" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" italic="1" style="0" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{96ec7de4-c56e-43b5-b272-81c659d6f103}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -19030,16 +15921,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -19081,35 +15972,41 @@ def my_form_open(dialog, layer, feature):
         <alias field="name" index="2" name=""/>
         <alias field="distance" index="3" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="name"/>
+        <policy policy="Duplicate" field="distance"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="distance" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="distance"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="distance" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="name"/>
-          <column hidden="0" type="field" width="-1" name="distance"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="name" width="-1" type="field" hidden="0"/>
+          <column name="distance" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19141,16 +16038,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="distance" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -19158,7 +16055,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="MultiPolygon" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" styleCategories="AllStyleCategories">
+    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -19198,19 +16095,20 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -19231,356 +16129,246 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="152,125,183,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="152,125,183,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="152,125,183,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{638d4661-4af7-4b67-a441-09cca39661c7}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="152,125,183,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="109,89,131,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="152,125,183,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="109,89,131,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="152,125,183,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="109,89,131,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="152,125,183,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="109,89,131,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="152,125,183,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="109,89,131,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="152,125,183,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="109,89,131,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="LinePatternFill" locked="0" enabled="1">
+            <layer id="{73145fbe-931c-4579-aa0e-58592a465db8}" locked="0" enabled="1" pass="0" class="LinePatternFill">
               <Option type="Map">
-                <Option type="QString" value="135" name="angle"/>
-                <Option type="QString" value="during_render" name="clip_mode"/>
-                <Option type="QString" value="211,134,33,255" name="color"/>
-                <Option type="QString" value="feature" name="coordinate_reference"/>
-                <Option type="QString" value="2" name="distance"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="distance_map_unit_scale"/>
-                <Option type="QString" value="MM" name="distance_unit"/>
-                <Option type="QString" value="0.26" name="line_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="line_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option name="angle" value="135" type="QString"/>
+                <Option name="clip_mode" value="during_render" type="QString"/>
+                <Option name="color" value="211,134,33,255" type="QString"/>
+                <Option name="coordinate_reference" value="feature" type="QString"/>
+                <Option name="distance" value="2" type="QString"/>
+                <Option name="distance_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="distance_unit" value="MM" type="QString"/>
+                <Option name="line_width" value="0.26" type="QString"/>
+                <Option name="line_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
               </Option>
-              <prop v="135" k="angle"/>
-              <prop v="during_render" k="clip_mode"/>
-              <prop v="211,134,33,255" k="color"/>
-              <prop v="feature" k="coordinate_reference"/>
-              <prop v="2" k="distance"/>
-              <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-              <prop v="MM" k="distance_unit"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="line" is_animated="0" name="@0@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@0@0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <layer id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}" locked="0" enabled="1" pass="0" class="SimpleLine">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="align_dash_pattern"/>
-                    <Option type="QString" value="square" name="capstyle"/>
-                    <Option type="QString" value="5;2" name="customdash"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="customdash_unit"/>
-                    <Option type="QString" value="0" name="dash_pattern_offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                    <Option type="QString" value="0" name="draw_inside_polygon"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="211,134,33,255" name="line_color"/>
-                    <Option type="QString" value="solid" name="line_style"/>
-                    <Option type="QString" value="0.3" name="line_width"/>
-                    <Option type="QString" value="MM" name="line_width_unit"/>
-                    <Option type="QString" value="0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0" name="ring_filter"/>
-                    <Option type="QString" value="0" name="trim_distance_end"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                    <Option type="QString" value="0" name="trim_distance_start"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                    <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                    <Option type="QString" value="0" name="use_custom_dash"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                    <Option name="align_dash_pattern" value="0" type="QString"/>
+                    <Option name="capstyle" value="square" type="QString"/>
+                    <Option name="customdash" value="5;2" type="QString"/>
+                    <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="customdash_unit" value="MM" type="QString"/>
+                    <Option name="dash_pattern_offset" value="0" type="QString"/>
+                    <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                    <Option name="draw_inside_polygon" value="0" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="line_color" value="211,134,33,255" type="QString"/>
+                    <Option name="line_style" value="solid" type="QString"/>
+                    <Option name="line_width" value="0.3" type="QString"/>
+                    <Option name="line_width_unit" value="MM" type="QString"/>
+                    <Option name="offset" value="0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="ring_filter" value="0" type="QString"/>
+                    <Option name="trim_distance_end" value="0" type="QString"/>
+                    <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                    <Option name="trim_distance_start" value="0" type="QString"/>
+                    <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                    <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                    <Option name="use_custom_dash" value="0" type="QString"/>
+                    <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   </Option>
-                  <prop v="0" k="align_dash_pattern"/>
-                  <prop v="square" k="capstyle"/>
-                  <prop v="5;2" k="customdash"/>
-                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                  <prop v="MM" k="customdash_unit"/>
-                  <prop v="0" k="dash_pattern_offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                  <prop v="MM" k="dash_pattern_offset_unit"/>
-                  <prop v="0" k="draw_inside_polygon"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="211,134,33,255" k="line_color"/>
-                  <prop v="solid" k="line_style"/>
-                  <prop v="0.3" k="line_width"/>
-                  <prop v="MM" k="line_width_unit"/>
-                  <prop v="0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0" k="ring_filter"/>
-                  <prop v="0" k="trim_distance_end"/>
-                  <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                  <prop v="MM" k="trim_distance_end_unit"/>
-                  <prop v="0" k="trim_distance_start"/>
-                  <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                  <prop v="MM" k="trim_distance_start_unit"/>
-                  <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                  <prop v="0" k="use_custom_dash"/>
-                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="211,134,33,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.46" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="no" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="211,134,33,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.46" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="no" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="211,134,33,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.46" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="no" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19591,93 +16379,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="id" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" italic="1" style="0" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{415aef82-46a2-4dec-86d6-89f9b40ee054}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -19685,16 +16446,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="1" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="1" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -19712,24 +16473,27 @@ def my_form_open(dialog, layer, feature):
       <aliases>
         <alias field="FID" index="0" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="FID"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="FID"/>
+        <default field="FID" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="FID" exp_strength="0"/>
+        <constraint unique_strength="0" field="FID" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="FID"/>
+        <constraint field="FID" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="431" name="type"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="type" width="431" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19761,12 +16525,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -19774,7 +16538,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -19823,23 +16587,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -19864,882 +16629,612 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="190,207,80,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="190,207,80,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="190,207,80,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{aa41f8f2-660a-40d2-ba74-664ae83521de}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="190,207,80,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="136,148,57,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="190,207,80,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,148,57,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="190,207,80,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="136,148,57,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="190,207,80,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="136,148,57,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="190,207,80,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,148,57,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="190,207,80,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="136,148,57,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open"/>
-          <rule symbol="1" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking"/>
-          <rule symbol="2" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed"/>
-          <rule symbol="3" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way"/>
-          <rule symbol="4" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures"/>
+          <rule filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" symbol="0" label="Road Open"/>
+          <rule filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" symbol="1" label="No Parking"/>
+          <rule filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" symbol="2" label="Lane Closed"/>
+          <rule filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" symbol="3" label="One-Way"/>
+          <rule filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" symbol="4" label="Road Closures"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,255,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.75" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,255,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="1" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="2" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="2" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="2" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@1@0" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{8668549c-374e-4077-bc7c-96a9bac646a8}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="circle" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="0,255,0,255" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0.5" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="1" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="circle" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="0,255,0,255" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0.5" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="1" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,255,0,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0.5" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="1" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="2" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="2;1;1;1" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,255,0,255" name="line_color"/>
-                <Option type="QString" value="dash dot dot" name="line_style"/>
-                <Option type="QString" value="0.75" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="1" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="2;1;1;1" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,255,0,255" type="QString"/>
+                <Option name="line_style" value="dash dot dot" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="2;1;1;1" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="dash dot dot" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="250" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="25" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="25" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="25" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@2@1" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@2@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{e7a97d22-eba0-4c48-9578-db859faf4112}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="0,255,0,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="35,35,35,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="3.5" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,255,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="35,35,35,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3.5" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="0,255,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3.5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="3" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="3" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{07696f80-e7db-403b-b380-82695a86ae34}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="3;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,255,0,255" name="line_color"/>
-                <Option type="QString" value="dash" name="line_style"/>
-                <Option type="QString" value="0.75" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="1" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="3;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,255,0,255" type="QString"/>
+                <Option name="line_style" value="dash" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="3;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="dash" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="250" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="25" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="Interval" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="250" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MapUnit" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="25" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="Interval" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="25" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="Interval" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@3@1" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@3@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <layer id="{e24fa060-35e4-4c51-b944-426558636610}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="square" name="cap_style"/>
-                    <Option type="QString" value="0,255,0,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="35,35,35,0" name="outline_color"/>
-                    <Option type="QString" value="solid" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="3.5" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="cap_style" value="square" type="QString"/>
+                    <Option name="color" value="0,255,0,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="35,35,35,0" type="QString"/>
+                    <Option name="outline_style" value="solid" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="3.5" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="square" k="cap_style"/>
-                  <prop v="0,255,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3.5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="4" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="4" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="255,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.75" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="255,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.75" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20748,189 +17243,151 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Regular" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="times" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="9" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="times" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="4294967295" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-          <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MM" priority="5" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="2" offsetType="0" centroidWhole="0" allowDegraded="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-          <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="4294967295" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+          <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-              <Option type="int" value="0" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-              <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-              <Option type="double" value="0" name="minLength"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-              <Option type="QString" value="MM" name="minLengthUnit"/>
-              <Option type="double" value="0" name="offsetFromAnchor"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-              <Option type="double" value="0" name="offsetFromLabel"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="id" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" italic="1" style="0" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{27379576-e711-4788-850d-75df56ba927b}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20938,16 +17395,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -20989,35 +17446,41 @@ def my_form_open(dialog, layer, feature):
         <alias field="status" index="2" name=""/>
         <alias field="times" index="3" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="status"/>
+        <policy policy="Duplicate" field="times"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="status"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="status" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="times" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="status" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="times" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="status"/>
-        <constraint desc="" exp="" field="times"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="status" exp="" desc=""/>
+        <constraint field="times" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="202" name="type"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="status"/>
-          <column hidden="0" type="field" width="-1" name="times"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="type" width="202" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="status" width="-1" type="field" hidden="0"/>
+          <column name="times" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21049,16 +17512,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="status"/>
-        <field editable="1" name="times"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="status" editable="1"/>
+        <field name="times" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="status"/>
-        <field labelOnTop="0" name="times"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="status" labelOnTop="0"/>
+        <field name="times" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -21066,21 +17529,21 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="Point" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" refreshOnNotifyMessage="" geometry="Point" styleCategories="AllStyleCategories">
+    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
-        <xmin>18.37569038998762494</xmin>
+        <xmin>18.37531611534391729</xmin>
         <ymin>-33.95582126985814853</ymin>
         <xmax>18.42275999405387665</xmax>
-        <ymax>-33.89974290493045572</ymax>
+        <ymax>-33.89975916640027265</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37569038998762494</xmin>
+        <xmin>18.37531611534391729</xmin>
         <ymin>-33.95582126985814853</ymin>
         <xmax>18.42275999405387665</xmax>
-        <ymax>-33.89974290493045572</ymax>
+        <ymax>-33.89975916640027265</ymax>
       </wgs84extent>
-      <id>route_markers_21122a5c_9be9_458c_9d62_573685055e1c</id>
-      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)</datasource>
+      <id>route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1</id>
+      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(5,0)</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -21106,6 +17569,7 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -21139,1182 +17603,1002 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{93207e61-042d-4541-8790-df2a776e7483}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="225,89,137,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="225,89,137,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="225,89,137,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="225,89,137,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="161,64,98,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="225,89,137,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="161,64,98,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="225,89,137,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="161,64,98,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="225,89,137,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="161,64,98,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="225,89,137,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="161,64,98,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="225,89,137,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="161,64,98,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="rule-based">
         <rules key="{0a67d1c6-0289-43d0-8cea-e94d16054c5d}">
           <rule description="Active routes" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{c7589943-f7c2-4796-a405-6a8c9e18ff15}">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="255,255,255,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="1" shapeOffsetY="0" shapeSizeX="1">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="213,180,60,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="213,180,60,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="213,180,60,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="0,0,0,255" name="color"/>
-                        <Option type="QString" value="round" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="1" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="0,0,0,255" k="color"/>
-                      <prop v="round" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="1" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option 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" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option 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" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="3" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="quadrant" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="quadrant" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="field" value="rotation" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show by day" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1a82228c-f408-4c3d-bb8d-158713c47604}">
             <settings calloutType="simple">
-              <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="255,255,255,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="1" shapeOffsetY="0" shapeSizeX="1">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="213,180,60,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="213,180,60,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="213,180,60,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="0,0,0,255" name="color"/>
-                        <Option type="QString" value="round" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="1" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="0,0,0,255" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="1" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="0,0,0,255" k="color"/>
-                      <prop v="round" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="0,0,0,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="1" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option 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" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                          <Option name="name" value="" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option type="bool" value="true" name="active"/>
-                              <Option 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" name="expression"/>
-                              <Option type="int" value="3" name="type"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" value="true" type="bool"/>
+                              <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                              <Option name="type" value="3" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="3" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option type="QString" value="quadrant" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="field" value="quadrant" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="QString" value="rotation" name="field"/>
-                      <Option type="int" value="2" name="type"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="field" value="rotation" type="QString"/>
+                      <Option name="type" value="2" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}">
-            <rule description="21KM" filter="&quot;Source&quot; = '21KM'" active="0" key="{69589abf-aba7-483e-bc24-1c579c8a7db2}">
+          <rule description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}" active="0">
+            <rule description="21KM" filter="&quot;Source&quot; = '21KM'" key="{69589abf-aba7-483e-bc24-1c579c8a7db2}" active="0">
               <settings calloutType="simple">
-                <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="255,255,255,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+                <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                  <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="210,32,39,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="1" shapeOffsetY="0" shapeSizeX="1">
-                    <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                  <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                  <background shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="210,32,39,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                    <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                         <Option type="Map">
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                          <Option type="QString" value="210,32,39,255" name="color"/>
-                          <Option type="QString" value="round" name="joinstyle"/>
-                          <Option type="QString" value="0,0" name="offset"/>
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                          <Option type="QString" value="MM" name="offset_unit"/>
-                          <Option type="QString" value="210,32,39,255" name="outline_color"/>
-                          <Option type="QString" value="solid" name="outline_style"/>
-                          <Option type="QString" value="1" name="outline_width"/>
-                          <Option type="QString" value="MM" name="outline_width_unit"/>
-                          <Option type="QString" value="solid" name="style"/>
+                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="color" value="210,32,39,255" type="QString"/>
+                          <Option name="joinstyle" value="round" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="210,32,39,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="1" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="style" value="solid" type="QString"/>
                         </Option>
-                        <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                        <prop v="210,32,39,255" k="color"/>
-                        <prop v="round" k="joinstyle"/>
-                        <prop v="0,0" k="offset"/>
-                        <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                        <prop v="MM" k="offset_unit"/>
-                        <prop v="210,32,39,255" k="outline_color"/>
-                        <prop v="solid" k="outline_style"/>
-                        <prop v="1" k="outline_width"/>
-                        <prop v="MM" k="outline_width_unit"/>
-                        <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" value="" name="name"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option type="QString" value="collection" name="type"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" value="true" name="active"/>
-                          <Option type="QString" value="quadrant" name="field"/>
-                          <Option type="int" value="2" name="type"/>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="field" value="quadrant" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="QString" value="rotation" name="field"/>
-                          <Option type="int" value="2" name="type"/>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="field" value="rotation" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-                <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="3" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2"/>
-                <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+                <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+                <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+                <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="quadrant" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="quadrant" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="rotation" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="field" value="rotation" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                    <Option type="int" value="0" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" value="" name="name"/>
+                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                    <Option name="blendMode" value="0" type="int"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
-                    <Option type="bool" value="false" name="drawToAllParts"/>
-                    <Option type="QString" value="0" name="enabled"/>
-                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                    <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                    <Option type="double" value="0" name="minLength"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                    <Option type="QString" value="MM" name="minLengthUnit"/>
-                    <Option type="double" value="0" name="offsetFromAnchor"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                    <Option type="double" value="0" name="offsetFromLabel"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                    <Option name="drawToAllParts" value="false" type="bool"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="10KM" filter="&quot;Source&quot; = '10KM'" active="0" key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}">
+            <rule description="10KM" filter="&quot;Source&quot; = '10KM'" key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}" active="0">
               <settings calloutType="simple">
-                <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="255,255,255,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+                <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                  <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="103,34,144,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="1" shapeOffsetY="0" shapeSizeX="1">
-                    <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                  <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                  <background shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="103,34,144,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                    <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                         <Option type="Map">
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                          <Option type="QString" value="103,34,144,255" name="color"/>
-                          <Option type="QString" value="round" name="joinstyle"/>
-                          <Option type="QString" value="0,0" name="offset"/>
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                          <Option type="QString" value="MM" name="offset_unit"/>
-                          <Option type="QString" value="103,34,144,255" name="outline_color"/>
-                          <Option type="QString" value="solid" name="outline_style"/>
-                          <Option type="QString" value="1" name="outline_width"/>
-                          <Option type="QString" value="MM" name="outline_width_unit"/>
-                          <Option type="QString" value="solid" name="style"/>
+                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="color" value="103,34,144,255" type="QString"/>
+                          <Option name="joinstyle" value="round" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="103,34,144,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="1" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="style" value="solid" type="QString"/>
                         </Option>
-                        <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                        <prop v="103,34,144,255" k="color"/>
-                        <prop v="round" k="joinstyle"/>
-                        <prop v="0,0" k="offset"/>
-                        <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                        <prop v="MM" k="offset_unit"/>
-                        <prop v="103,34,144,255" k="outline_color"/>
-                        <prop v="solid" k="outline_style"/>
-                        <prop v="1" k="outline_width"/>
-                        <prop v="MM" k="outline_width_unit"/>
-                        <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" value="" name="name"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option type="QString" value="collection" name="type"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" value="true" name="active"/>
-                          <Option type="QString" value="quadrant" name="field"/>
-                          <Option type="int" value="2" name="type"/>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="field" value="quadrant" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="QString" value="rotation" name="field"/>
-                          <Option type="int" value="2" name="type"/>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="field" value="rotation" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-                <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2"/>
-                <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+                <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+                <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+                <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="quadrant" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="quadrant" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="rotation" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="field" value="rotation" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                    <Option type="int" value="0" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" value="" name="name"/>
+                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                    <Option name="blendMode" value="0" type="int"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
-                    <Option type="bool" value="false" name="drawToAllParts"/>
-                    <Option type="QString" value="0" name="enabled"/>
-                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                    <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                    <Option type="double" value="0" name="minLength"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                    <Option type="QString" value="MM" name="minLengthUnit"/>
-                    <Option type="double" value="0" name="offsetFromAnchor"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                    <Option type="double" value="0" name="offsetFromLabel"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                    <Option name="drawToAllParts" value="false" type="bool"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="5KM" filter="&quot;Source&quot; = '5KM'" active="0" key="{693188a6-ae99-4fd2-859f-1606793dda66}">
+            <rule description="5KM" filter="&quot;Source&quot; = '5KM'" key="{693188a6-ae99-4fd2-859f-1606793dda66}" active="0">
               <settings calloutType="simple">
-                <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="255,255,255,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+                <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                  <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="128" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="1" shapeOffsetY="0" shapeSizeX="1">
-                    <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                  <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                  <background shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                    <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                         <Option type="Map">
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                          <Option type="QString" value="145,211,55,255" name="color"/>
-                          <Option type="QString" value="round" name="joinstyle"/>
-                          <Option type="QString" value="0,0" name="offset"/>
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                          <Option type="QString" value="MM" name="offset_unit"/>
-                          <Option type="QString" value="145,211,55,255" name="outline_color"/>
-                          <Option type="QString" value="solid" name="outline_style"/>
-                          <Option type="QString" value="1" name="outline_width"/>
-                          <Option type="QString" value="MM" name="outline_width_unit"/>
-                          <Option type="QString" value="solid" name="style"/>
+                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="color" value="145,211,55,255" type="QString"/>
+                          <Option name="joinstyle" value="round" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="145,211,55,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="1" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="style" value="solid" type="QString"/>
                         </Option>
-                        <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                        <prop v="145,211,55,255" k="color"/>
-                        <prop v="round" k="joinstyle"/>
-                        <prop v="0,0" k="offset"/>
-                        <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                        <prop v="MM" k="offset_unit"/>
-                        <prop v="145,211,55,255" k="outline_color"/>
-                        <prop v="solid" k="outline_style"/>
-                        <prop v="1" k="outline_width"/>
-                        <prop v="MM" k="outline_width_unit"/>
-                        <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" value="" name="name"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option type="QString" value="collection" name="type"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="int" value="1" name="type"/>
-                          <Option type="QString" value="" name="val"/>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" value="true" name="active"/>
-                          <Option type="QString" value="quadrant" name="field"/>
-                          <Option type="int" value="2" name="type"/>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" value="true" type="bool"/>
+                          <Option name="field" value="quadrant" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" value="false" name="active"/>
-                          <Option type="QString" value="rotation" name="field"/>
-                          <Option type="int" value="2" name="type"/>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="field" value="rotation" type="QString"/>
+                          <Option name="type" value="2" type="int"/>
                         </Option>
                       </Option>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-                <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2"/>
-                <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+                <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+                <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+                <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="quadrant" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="quadrant" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="rotation" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="field" value="rotation" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                    <Option type="int" value="0" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" value="" name="name"/>
+                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                    <Option name="blendMode" value="0" type="int"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
-                    <Option type="bool" value="false" name="drawToAllParts"/>
-                    <Option type="QString" value="0" name="enabled"/>
-                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                    <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                    <Option type="double" value="0" name="minLength"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                    <Option type="QString" value="MM" name="minLengthUnit"/>
-                    <Option type="double" value="0" name="offsetFromAnchor"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                    <Option type="double" value="0" name="offsetFromLabel"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                    <Option name="drawToAllParts" value="false" type="bool"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="Trail" filter="&quot;Source&quot; = 'Trail'" active="0" key="{ba58e108-c24a-410e-9584-a7819af049ef}">
+            <rule description="Trail" filter="&quot;Source&quot; = 'Trail'" key="{ba58e108-c24a-410e-9584-a7819af049ef}" active="0">
               <settings calloutType="simple">
-                <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" textColor="255,255,255,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+                <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferNoFill="0" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                  <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="1" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="1" shapeOffsetY="0" shapeSizeX="1">
-                    <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                  <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                  <background shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                    <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                         <Option type="Map">
-                          <Option type="QString" value="0" name="angle"/>
-                          <Option type="QString" value="square" name="cap_style"/>
-                          <Option type="QString" value="133,182,111,255" name="color"/>
-                          <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                          <Option type="QString" value="bevel" name="joinstyle"/>
-                          <Option type="QString" value="circle" name="name"/>
-                          <Option type="QString" value="0,0" name="offset"/>
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                          <Option type="QString" value="MM" name="offset_unit"/>
-                          <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                          <Option type="QString" value="solid" name="outline_style"/>
-                          <Option type="QString" value="0" name="outline_width"/>
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                          <Option type="QString" value="MM" name="outline_width_unit"/>
-                          <Option type="QString" value="diameter" name="scale_method"/>
-                          <Option type="QString" value="2" name="size"/>
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                          <Option type="QString" value="MM" name="size_unit"/>
-                          <Option type="QString" value="1" name="vertical_anchor_point"/>
+                          <Option name="angle" value="0" type="QString"/>
+                          <Option name="cap_style" value="square" type="QString"/>
+                          <Option name="color" value="133,182,111,255" type="QString"/>
+                          <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                          <Option name="joinstyle" value="bevel" type="QString"/>
+                          <Option name="name" value="circle" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="0" type="QString"/>
+                          <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="scale_method" value="diameter" type="QString"/>
+                          <Option name="size" value="2" type="QString"/>
+                          <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="size_unit" value="MM" type="QString"/>
+                          <Option name="vertical_anchor_point" value="1" type="QString"/>
                         </Option>
-                        <prop v="0" k="angle"/>
-                        <prop v="square" k="cap_style"/>
-                        <prop v="133,182,111,255" k="color"/>
-                        <prop v="1" k="horizontal_anchor_point"/>
-                        <prop v="bevel" k="joinstyle"/>
-                        <prop v="circle" k="name"/>
-                        <prop v="0,0" k="offset"/>
-                        <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                        <prop v="MM" k="offset_unit"/>
-                        <prop v="35,35,35,255" k="outline_color"/>
-                        <prop v="solid" k="outline_style"/>
-                        <prop v="0" k="outline_width"/>
-                        <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                        <prop v="MM" k="outline_width_unit"/>
-                        <prop v="diameter" k="scale_method"/>
-                        <prop v="2" k="size"/>
-                        <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                        <prop v="MM" k="size_unit"/>
-                        <prop v="1" k="vertical_anchor_point"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" value="" name="name"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option type="QString" value="collection" name="type"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                    <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                         <Option type="Map">
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                          <Option type="QString" value="0,72,255,255" name="color"/>
-                          <Option type="QString" value="round" name="joinstyle"/>
-                          <Option type="QString" value="0,0" name="offset"/>
-                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                          <Option type="QString" value="MM" name="offset_unit"/>
-                          <Option type="QString" value="0,72,255,255" name="outline_color"/>
-                          <Option type="QString" value="solid" name="outline_style"/>
-                          <Option type="QString" value="1" name="outline_width"/>
-                          <Option type="QString" value="MM" name="outline_width_unit"/>
-                          <Option type="QString" value="solid" name="style"/>
+                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="color" value="0,72,255,255" type="QString"/>
+                          <Option name="joinstyle" value="round" type="QString"/>
+                          <Option name="offset" value="0,0" type="QString"/>
+                          <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                          <Option name="offset_unit" value="MM" type="QString"/>
+                          <Option name="outline_color" value="0,72,255,255" type="QString"/>
+                          <Option name="outline_style" value="solid" type="QString"/>
+                          <Option name="outline_width" value="1" type="QString"/>
+                          <Option name="outline_width_unit" value="MM" type="QString"/>
+                          <Option name="style" value="solid" type="QString"/>
                         </Option>
-                        <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                        <prop v="0,72,255,255" k="color"/>
-                        <prop v="round" k="joinstyle"/>
-                        <prop v="0,0" k="offset"/>
-                        <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                        <prop v="MM" k="offset_unit"/>
-                        <prop v="0,72,255,255" k="outline_color"/>
-                        <prop v="solid" k="outline_style"/>
-                        <prop v="1" k="outline_width"/>
-                        <prop v="MM" k="outline_width_unit"/>
-                        <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" value="" name="name"/>
+                            <Option name="name" value="" type="QString"/>
                             <Option name="properties"/>
-                            <Option type="QString" value="collection" name="type"/>
+                            <Option name="type" value="collection" type="QString"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-                <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="10" maxCurvedCharAngleIn="20" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="6" offsetType="0" centroidWhole="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="2"/>
-                <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+                <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+                <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+                <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                    <Option name="name" value="" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="int" value="1" name="type"/>
-                        <Option type="QString" value="" name="val"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="type" value="1" type="int"/>
+                        <Option name="val" value="" type="QString"/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" value="true" name="active"/>
-                        <Option type="QString" value="quadrant" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" value="true" type="bool"/>
+                        <Option name="field" value="quadrant" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" value="false" name="active"/>
-                        <Option type="QString" value="rotation" name="field"/>
-                        <Option type="int" value="2" name="type"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" value="false" type="bool"/>
+                        <Option name="field" value="rotation" type="QString"/>
+                        <Option name="type" value="2" type="int"/>
                       </Option>
                     </Option>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                    <Option type="int" value="0" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" value="" name="name"/>
+                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                    <Option name="blendMode" value="0" type="int"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
-                    <Option type="bool" value="false" name="drawToAllParts"/>
-                    <Option type="QString" value="0" name="enabled"/>
-                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                    <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                    <Option type="double" value="0" name="minLength"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                    <Option type="QString" value="MM" name="minLengthUnit"/>
-                    <Option type="double" value="0" name="offsetFromAnchor"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                    <Option type="double" value="0" name="offsetFromLabel"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                    <Option name="drawToAllParts" value="false" type="bool"/>
+                    <Option name="enabled" value="0" type="QString"/>
+                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
@@ -22324,95 +18608,68 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="no_action" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="100000" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{356245f8-3346-4eac-9a56-56f8cd3c59de}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22420,16 +18677,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="2" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -22440,8 +18697,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22450,8 +18707,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22460,8 +18717,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22470,8 +18727,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22480,8 +18737,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22490,8 +18747,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22500,8 +18757,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22510,8 +18767,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22534,8 +18791,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22544,8 +18801,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22554,8 +18811,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22564,8 +18821,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -22595,79 +18852,96 @@ def my_form_open(dialog, layer, feature):
         <alias field="distance" index="13" name=""/>
         <alias field="quadrant" index="14" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="Name"/>
+        <policy policy="Duplicate" field="descriptio"/>
+        <policy policy="Duplicate" field="timestamp"/>
+        <policy policy="Duplicate" field="begin"/>
+        <policy policy="Duplicate" field="end"/>
+        <policy policy="Duplicate" field="Distance"/>
+        <policy policy="Duplicate" field="RouteLen"/>
+        <policy policy="Duplicate" field="Source"/>
+        <policy policy="Duplicate" field="Sort"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="length_km"/>
+        <policy policy="Duplicate" field="length_m"/>
+        <policy policy="Duplicate" field="org_fid"/>
+        <policy policy="Duplicate" field="distance"/>
+        <policy policy="Duplicate" field="quadrant"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="Sort"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" field="length_m"/>
-        <default applyOnUpdate="0" expression="" field="org_fid"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="Name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="descriptio" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="timestamp" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="begin" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="end" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Distance" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="RouteLen" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Source" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Sort" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="length_km" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="length_m" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="org_fid" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="distance" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="quadrant" exp_strength="0"/>
+        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Sort" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="org_fid" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="quadrant" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="Sort"/>
-        <constraint desc="" exp="" field="day"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="org_fid"/>
-        <constraint desc="" exp="" field="distance"/>
-        <constraint desc="" exp="" field="quadrant"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="Sort" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="org_fid" exp="" desc=""/>
+        <constraint field="distance" exp="" desc=""/>
+        <constraint field="quadrant" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="org_fid"/>
-          <column hidden="0" type="field" width="-1" name="distance"/>
-          <column hidden="0" type="field" width="-1" name="Name"/>
-          <column hidden="0" type="field" width="-1" name="Source"/>
-          <column hidden="0" type="field" width="-1" name="RouteLen"/>
-          <column hidden="0" type="field" width="-1" name="descriptio"/>
-          <column hidden="0" type="field" width="-1" name="timestamp"/>
-          <column hidden="0" type="field" width="-1" name="begin"/>
-          <column hidden="0" type="field" width="-1" name="end"/>
-          <column hidden="0" type="field" width="-1" name="Distance"/>
-          <column hidden="0" type="field" width="-1" name="length_km"/>
-          <column hidden="0" type="field" width="-1" name="Sort"/>
-          <column hidden="0" type="field" width="-1" name="quadrant"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
-          <column hidden="0" type="field" width="-1" name="length_m"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="org_fid" width="-1" type="field" hidden="0"/>
+          <column name="distance" width="-1" type="field" hidden="0"/>
+          <column name="Name" width="-1" type="field" hidden="0"/>
+          <column name="Source" width="-1" type="field" hidden="0"/>
+          <column name="RouteLen" width="-1" type="field" hidden="0"/>
+          <column name="descriptio" width="-1" type="field" hidden="0"/>
+          <column name="timestamp" width="-1" type="field" hidden="0"/>
+          <column name="begin" width="-1" type="field" hidden="0"/>
+          <column name="end" width="-1" type="field" hidden="0"/>
+          <column name="Distance" width="-1" type="field" hidden="0"/>
+          <column name="length_km" width="-1" type="field" hidden="0"/>
+          <column name="Sort" width="-1" type="field" hidden="0"/>
+          <column name="quadrant" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="length_m" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22699,62 +18973,62 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Sort"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Sort"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="quadrant"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Sort" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="quadrant" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="Distance"/>
-        <field reuseLastValue="0" name="Name"/>
-        <field reuseLastValue="0" name="RouteLen"/>
-        <field reuseLastValue="0" name="Sort"/>
-        <field reuseLastValue="0" name="Source"/>
-        <field reuseLastValue="0" name="begin"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="descriptio"/>
-        <field reuseLastValue="0" name="distance"/>
-        <field reuseLastValue="0" name="end"/>
-        <field reuseLastValue="0" name="length_km"/>
-        <field reuseLastValue="0" name="length_m"/>
-        <field reuseLastValue="0" name="org_fid"/>
-        <field reuseLastValue="0" name="quadrant"/>
-        <field reuseLastValue="0" name="timestamp"/>
+        <field name="Distance" reuseLastValue="0"/>
+        <field name="Name" reuseLastValue="0"/>
+        <field name="RouteLen" reuseLastValue="0"/>
+        <field name="Sort" reuseLastValue="0"/>
+        <field name="Source" reuseLastValue="0"/>
+        <field name="begin" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="descriptio" reuseLastValue="0"/>
+        <field name="distance" reuseLastValue="0"/>
+        <field name="end" reuseLastValue="0"/>
+        <field name="length_km" reuseLastValue="0"/>
+        <field name="length_m" reuseLastValue="0"/>
+        <field name="org_fid" reuseLastValue="0"/>
+        <field name="quadrant" reuseLastValue="0"/>
+        <field name="timestamp" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="MultiPolygon" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" styleCategories="AllStyleCategories">
+    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -22794,18 +19068,19 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
@@ -22827,241 +19102,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{5dca61e4-69c2-4b97-a344-09472092e8cb}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="229,182,54,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="229,182,54,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="229,182,54,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="229,182,54,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="164,130,39,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="229,182,54,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="164,130,39,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="229,182,54,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="164,130,39,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="229,182,54,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="164,130,39,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="229,182,54,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="164,130,39,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="229,182,54,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="164,130,39,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="114,155,111,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="114,155,111,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="114,155,111,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23072,18 +19279,18 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="&quot;id&quot;" name="dualview/previewExpressions"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="&quot;id&quot;" type="QString"/>
         </Option>
       </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=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -23117,31 +19324,36 @@ def my_form_open(dialog, layer, feature):
         <alias field="area" index="1" name=""/>
         <alias field="rotation" index="2" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="area"/>
+        <policy policy="Duplicate" field="rotation"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="area"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="area" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="rotation" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="area" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="rotation" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="area"/>
-        <constraint desc="" exp="" field="rotation"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="area" exp="" desc=""/>
+        <constraint field="rotation" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="area"/>
-          <column hidden="0" type="field" width="-1" name="rotation"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="area" width="-1" type="field" hidden="0"/>
+          <column name="rotation" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23164,7 +19376,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="Point" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Point" styleCategories="AllStyleCategories">
+    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -23213,23 +19425,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -23254,271 +19467,195 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{365af962-5b68-4f08-a049-7f2e6c9b8744}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="196,60,57,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="196,60,57,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="196,60,57,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="196,60,57,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="140,43,41,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="196,60,57,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="140,43,41,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="196,60,57,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="140,43,41,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="196,60,57,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="140,43,41,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="196,60,57,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="140,43,41,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="196,60,57,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="140,43,41,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances"/>
+          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" symbol="0" label="All distances" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="1" enabled="1">
+            <layer id="{929956be-fb51-4c17-886b-1ed43d282cde}" locked="1" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="circle" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,0" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="0.5" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,0" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="0.5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,0" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option type="bool" value="true" name="active"/>
-                      <Option 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" name="expression"/>
-                      <Option type="int" value="3" name="type"/>
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option name="active" value="true" type="bool"/>
+                      <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                      <Option name="type" value="3" type="int"/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option type="bool" value="false" name="active"/>
-                      <Option type="int" value="1" name="type"/>
-                      <Option type="QString" value="" name="val"/>
+                    <Option name="size" type="Map">
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="type" value="1" type="int"/>
+                      <Option name="val" value="" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23530,97 +19667,70 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="StringList" name="dualview/previewExpressions">
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="StringList">
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23628,16 +19738,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -23669,8 +19779,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -23686,8 +19796,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -23696,8 +19806,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -23760,71 +19870,86 @@ def my_form_open(dialog, layer, feature):
         <alias field="first_runn" index="11" name=""/>
         <alias field="last_runne" index="12" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="Name"/>
+        <policy policy="Duplicate" field="descriptio"/>
+        <policy policy="Duplicate" field="timestamp"/>
+        <policy policy="Duplicate" field="begin"/>
+        <policy policy="Duplicate" field="end"/>
+        <policy policy="Duplicate" field="RouteLen"/>
+        <policy policy="Duplicate" field="Source"/>
+        <policy policy="Duplicate" field="length_m"/>
+        <policy policy="Duplicate" field="length_km"/>
+        <policy policy="Duplicate" field="org_fid"/>
+        <policy policy="Duplicate" field="distance"/>
+        <policy policy="Duplicate" field="first_runn"/>
+        <policy policy="Duplicate" field="last_runne"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="length_m"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" field="org_fid"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
-        <default applyOnUpdate="0" expression="" field="first_runn"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="Name" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="descriptio" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="timestamp" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="begin" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="end" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="RouteLen" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="Source" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="length_m" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="length_km" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="org_fid" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="distance" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="first_runn" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="last_runne" exp_strength="0"/>
+        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="org_fid" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="first_runn" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="last_runne" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="org_fid"/>
-        <constraint desc="" exp="" field="distance"/>
-        <constraint desc="" exp="" field="first_runn"/>
-        <constraint desc="" exp="" field="last_runne"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="org_fid" exp="" desc=""/>
+        <constraint field="distance" exp="" desc=""/>
+        <constraint field="first_runn" exp="" desc=""/>
+        <constraint field="last_runne" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;first_runn&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="179" name="begin"/>
-          <column hidden="0" type="field" width="-1" name="RouteLen"/>
-          <column hidden="0" type="field" width="-1" name="Source"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="Name"/>
-          <column hidden="0" type="field" width="-1" name="length_m"/>
-          <column hidden="0" type="field" width="-1" name="length_km"/>
-          <column hidden="0" type="field" width="-1" name="org_fid"/>
-          <column hidden="0" type="field" width="-1" name="first_runn"/>
-          <column hidden="0" type="field" width="-1" name="last_runne"/>
-          <column hidden="0" type="field" width="-1" name="descriptio"/>
-          <column hidden="0" type="field" width="-1" name="timestamp"/>
-          <column hidden="0" type="field" width="-1" name="end"/>
-          <column hidden="0" type="field" width="-1" name="distance"/>
+          <column name="begin" width="179" type="field" hidden="0"/>
+          <column name="RouteLen" width="-1" type="field" hidden="0"/>
+          <column name="Source" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="Name" width="-1" type="field" hidden="0"/>
+          <column name="length_m" width="-1" type="field" hidden="0"/>
+          <column name="length_km" width="-1" type="field" hidden="0"/>
+          <column name="org_fid" width="-1" type="field" hidden="0"/>
+          <column name="first_runn" width="-1" type="field" hidden="0"/>
+          <column name="last_runne" width="-1" type="field" hidden="0"/>
+          <column name="descriptio" width="-1" type="field" hidden="0"/>
+          <column name="timestamp" width="-1" type="field" hidden="0"/>
+          <column name="end" width="-1" type="field" hidden="0"/>
+          <column name="distance" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23856,58 +19981,58 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="display"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="distance_1"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="first_run"/>
-        <field editable="1" name="first_runn"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="first_runner_s"/>
-        <field editable="0" name="last_run"/>
-        <field editable="1" name="last_runn"/>
-        <field editable="1" name="last_runne"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="last_runner_s"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="display" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="distance_1" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="first_run" editable="1"/>
+        <field name="first_runn" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="first_runner_s" editable="1"/>
+        <field name="last_run" editable="0"/>
+        <field name="last_runn" editable="1"/>
+        <field name="last_runne" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="last_runner_s" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="display"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="distance_1"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="first_run"/>
-        <field labelOnTop="0" name="first_runn"/>
-        <field labelOnTop="0" name="first_runner"/>
-        <field labelOnTop="0" name="first_runner_s"/>
-        <field labelOnTop="0" name="last_run"/>
-        <field labelOnTop="0" name="last_runn"/>
-        <field labelOnTop="0" name="last_runne"/>
-        <field labelOnTop="0" name="last_runner"/>
-        <field labelOnTop="0" name="last_runner_s"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="display" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="distance_1" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="first_run" labelOnTop="0"/>
+        <field name="first_runn" labelOnTop="0"/>
+        <field name="first_runner" labelOnTop="0"/>
+        <field name="first_runner_s" labelOnTop="0"/>
+        <field name="last_run" labelOnTop="0"/>
+        <field name="last_runn" labelOnTop="0"/>
+        <field name="last_runne" labelOnTop="0"/>
+        <field name="last_runner" labelOnTop="0"/>
+        <field name="last_runner_s" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -23915,7 +20040,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="0" readOnly="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Line" styleCategories="AllStyleCategories">
+    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -23955,19 +20080,20 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -23988,476 +20114,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{963b9e9e-c03d-476c-a792-effe8028add1}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="190,178,151,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="190,178,151,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="190,178,151,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{7362ff98-e908-498b-82c9-17b74285e0f4}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="190,178,151,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="136,127,108,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="190,178,151,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,127,108,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="190,178,151,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="136,127,108,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{20af25c5-139a-4a43-b257-4147f560bd1e}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="190,178,151,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="136,127,108,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="190,178,151,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="136,127,108,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="190,178,151,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="136,127,108,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car"/>
-          <rule symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking"/>
+          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" label="Car"/>
+          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" label="Walking"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" is_animated="0" name="0" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="123,211,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="1" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="123,211,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="123,211,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="1" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="flat" name="capstyle"/>
-                <Option type="QString" value="4;1;1;1" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="103,34,144,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="1.25" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="1" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="flat" type="QString"/>
+                <Option name="customdash" value="4;1;1;1" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="103,34,144,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="1.25" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="1" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="flat" k="capstyle"/>
-              <prop v="4;1;1;1" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1.25" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+            <layer id="{c75a7de7-f06a-429a-b940-1629f9306aaa}" locked="0" enabled="1" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option type="QString" value="4" name="average_angle_length"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
-                <Option type="QString" value="MM" name="average_angle_unit"/>
-                <Option type="QString" value="3" name="interval"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
-                <Option type="QString" value="MM" name="interval_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="0" name="offset_along_line"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_along_line_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="bool" value="true" name="place_on_every_part"/>
-                <Option type="QString" value="LastVertex" name="placements"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="1" name="rotate"/>
+                <Option name="average_angle_length" value="4" type="QString"/>
+                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="average_angle_unit" value="MM" type="QString"/>
+                <Option name="interval" value="3" type="QString"/>
+                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="interval_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_along_line" value="0" type="QString"/>
+                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_along_line_unit" value="MM" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="place_on_every_part" value="true" type="bool"/>
+                <Option name="placements" value="LastVertex" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="rotate" value="1" type="QString"/>
               </Option>
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="true" k="place_on_every_part"/>
-              <prop v="LastVertex" k="placements"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" is_animated="0" name="@1@1" frame_rate="10" clip_to_extent="1" alpha="1">
+              <symbol frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                <layer id="{c86ba77b-3947-4686-9d93-5c997e6dde40}" locked="0" enabled="1" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option type="QString" value="0" name="angle"/>
-                    <Option type="QString" value="103,34,144,255" name="color"/>
-                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                    <Option type="QString" value="filled_arrowhead" name="name"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="diameter" name="scale_method"/>
-                    <Option type="QString" value="5" name="size"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="size_unit"/>
-                    <Option type="QString" value="1" name="vertical_anchor_point"/>
+                    <Option name="angle" value="0" type="QString"/>
+                    <Option name="color" value="103,34,144,255" type="QString"/>
+                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                    <Option name="name" value="filled_arrowhead" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="scale_method" value="diameter" type="QString"/>
+                    <Option name="size" value="5" type="QString"/>
+                    <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="size_unit" value="MM" type="QString"/>
+                    <Option name="vertical_anchor_point" value="1" type="QString"/>
                   </Option>
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="@@1@1@0" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="{61856921-c649-4f9a-86f1-1032eeec1eca}" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="103,34,144,255" name="color"/>
-                        <Option type="QString" value="miter" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="no" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="103,34,144,255" type="QString"/>
+                        <Option name="joinstyle" value="miter" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="no" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -24470,93 +20446,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="id" name="dualview/previewExpressions"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="id" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" italic="1" style="0" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24564,16 +20513,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="2" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -24599,27 +20548,31 @@ def my_form_open(dialog, layer, feature):
         <alias field="id" index="0" name=""/>
         <alias field="type" index="1" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="type"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="type"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="type" width="-1" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24651,12 +20604,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -24664,7 +20617,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="Point" simplifyDrawingHints="0" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Point" styleCategories="AllStyleCategories">
+    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -24704,19 +20657,20 @@ def my_form_open(dialog, layer, feature):
         <title></title>
         <abstract></abstract>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -24737,386 +20691,291 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{360268ec-74bf-49a5-9cdc-3d49f645479f}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="145,82,45,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="145,82,45,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="145,82,45,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="145,82,45,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="104,59,32,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="145,82,45,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="104,59,32,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="145,82,45,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="104,59,32,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="145,82,45,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="104,59,32,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="145,82,45,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="104,59,32,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="145,82,45,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="104,59,32,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style namedStyle="Semibold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="label" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="15" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="label" fontSize="15" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="3" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-          <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MM" priority="5" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" geometryGeneratorEnabled="0" quadOffset="4" placement="0" offsetType="0" centroidWhole="0" allowDegraded="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-          <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="0" obstacle="1" scaleMax="0" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="2000" mergeLines="0"/>
+          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+          <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-              <Option type="int" value="0" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="blendMode" value="0" type="int"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-              <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-              <Option type="double" value="0" name="minLength"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-              <Option type="QString" value="MM" name="minLengthUnit"/>
-              <Option type="double" value="0" name="offsetFromAnchor"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-              <Option type="double" value="0" name="offsetFromLabel"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" italic="1" style="0" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25124,16 +20983,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="18" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -25159,27 +21018,31 @@ def my_form_open(dialog, layer, feature):
         <alias field="id" index="0" name=""/>
         <alias field="label" index="1" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="label"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="label"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="label" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="label" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="label"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="label" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="0" type="field" width="-1" name="label"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="label" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25211,12 +21074,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -25224,7 +21087,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" simplifyAlgorithm="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" symbologyReferenceScale="-1" autoRefreshEnabled="0" labelsEnabled="1" readOnly="0" wkbType="MultiPolygon" simplifyDrawingHints="1" type="vector" autoRefreshTime="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" refreshOnNotifyMessage="" geometry="Polygon" styleCategories="AllStyleCategories">
+    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -25273,23 +21136,24 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links/>
+        <dates/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+            <srsid>3452</srsid>
+            <srid>4326</srid>
+            <authid>EPSG:4326</authid>
+            <description>WGS 84</description>
+            <projectionacronym>longlat</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" miny="0" maxz="0" minx="0" maxy="0" crs="" minz="0" maxx="0"/>
+          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -25314,354 +21178,267 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" fixedDuration="0" accumulate="0" startExpression="" durationUnit="min" mode="0" endExpression="" endField="" startField="" enabled="0" limitMode="0">
+      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zoffset="0" extrusion="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{21311e5c-9c25-4470-8640-7b6d873bbd81}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="125,139,143,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.6" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="125,139,143,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="125,139,143,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.6" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{653976c3-86ea-4acf-889f-aa8a836d6d67}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="125,139,143,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="89,99,102,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="89,99,102,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="125,139,143,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="89,99,102,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+            <layer id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}" locked="0" enabled="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="125,139,143,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="diamond" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="89,99,102,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.2" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="3" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="125,139,143,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="89,99,102,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <prop v="0" k="angle"/>
-              <prop v="square" k="cap_style"/>
-              <prop v="125,139,143,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="diamond" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="89,99,102,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="3" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
           <rule description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
             <settings calloutType="simple">
-              <text-style namedStyle="Bold" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" textColor="31,120,180,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fieldName="label" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" fontWordSpacing="0" textOrientation="horizontal" fontSize="8" fontWeight="75" fontSizeUnit="Point" fontFamily="Myriad Pro" useSubstitutions="0" legendString="Aa" forcedBold="0">
+              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="label" fontSize="8" textOrientation="horizontal" fontKerning="1" textColor="31,120,180,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" isExpression="0" namedStyle="Bold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="0" bufferSize="0.75" bufferColor="255,255,255,255" bufferOpacity="0.40000000000000002" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-                <background shapeRadiiUnit="MM" shapeSizeY="0.29999999999999999" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,204" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeDraw="1" shapeBorderWidthUnit="MM" shapeOpacity="0.59999999999999998" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0.5" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0.5" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0.75" shapeOffsetY="-0.14999999999999999" shapeSizeX="0.75">
-                  <symbol force_rhr="0" type="marker" is_animated="0" name="markerSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferSize="0.75" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+                <background shapeFillColor="255,255,255,204" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="-0.14999999999999999" shapeType="0" shapeRadiiX="0.5" shapeBorderColor="31,120,206,255" shapeBorderWidth="0.75" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.29999999999999999" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeOpacity="0.59999999999999998" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0.5" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option type="QString" value="0" name="angle"/>
-                        <Option type="QString" value="square" name="cap_style"/>
-                        <Option type="QString" value="196,60,57,255" name="color"/>
-                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                        <Option type="QString" value="bevel" name="joinstyle"/>
-                        <Option type="QString" value="circle" name="name"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0" name="outline_width"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="diameter" name="scale_method"/>
-                        <Option type="QString" value="2" name="size"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="size_unit"/>
-                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="196,60,57,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
-                      <prop v="0" k="angle"/>
-                      <prop v="square" k="cap_style"/>
-                      <prop v="196,60,57,255" k="color"/>
-                      <prop v="1" k="horizontal_anchor_point"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="circle" k="name"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="35,35,35,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="diameter" k="scale_method"/>
-                      <prop v="2" k="size"/>
-                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                      <prop v="MM" k="size_unit"/>
-                      <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" value="" name="name"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" value="collection" name="type"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                        <Option type="QString" value="255,255,255,204" name="color"/>
-                        <Option type="QString" value="round" name="joinstyle"/>
-                        <Option type="QString" value="0,0" name="offset"/>
-                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                        <Option type="QString" value="MM" name="offset_unit"/>
-                        <Option type="QString" value="31,120,206,255" name="outline_color"/>
-                        <Option type="QString" value="solid" name="outline_style"/>
-                        <Option type="QString" value="0.75" name="outline_width"/>
-                        <Option type="QString" value="MM" name="outline_width_unit"/>
-                        <Option type="QString" value="solid" name="style"/>
+                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="color" value="255,255,255,204" type="QString"/>
+                        <Option name="joinstyle" value="round" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="31,120,206,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0.75" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="style" value="solid" type="QString"/>
                       </Option>
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="255,255,255,204" k="color"/>
-                      <prop v="round" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="31,120,206,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.75" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" value="" name="name"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" value="collection" name="type"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" multilineAlign="1" wrapChar="" placeDirectionSymbol="0" autoWrapLength="0" formatNumbers="0"/>
-              <placement lineAnchorPercent="0.5" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" preserveRotation="1" offsetUnits="MapUnit" priority="5" maxCurvedCharAngleIn="25" rotationUnit="AngleDegrees" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" geometryGenerator="" rotationAngle="0" maxCurvedCharAngleOut="-25" layerType="PolygonGeometry" repeatDistanceUnits="MM" repeatDistance="0" placementFlags="10" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistanceUnit="MM" fitInPolygonOnly="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="1" geometryGeneratorEnabled="0" quadOffset="1" placement="0" offsetType="0" centroidWhole="1" allowDegraded="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" overrunDistance="0" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0"/>
-              <rendering fontMinPixelSize="3" obstacleType="0" scaleMin="1" obstacle="1" scaleMax="10000000" labelPerPart="0" minFeatureSize="0" fontLimitPixelSize="0" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" zIndex="5" upsidedownLabels="0" obstacleFactor="0.76000000000000001" fontMaxPixelSize="10000" drawLabels="1" maxNumLabels="6" mergeLines="0"/>
+              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="1" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
+              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="1" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="0" quadOffset="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PolygonGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
+              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="5" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="6" mergeLines="0" obstacleFactor="0.76000000000000001" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-                  <Option type="int" value="0" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" value="" name="name"/>
+                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+                  <Option name="blendMode" value="0" type="int"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
-                  <Option type="bool" value="false" name="drawToAllParts"/>
-                  <Option type="QString" value="0" name="enabled"/>
-                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-                  <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-                  <Option type="double" value="0" name="minLength"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-                  <Option type="QString" value="MM" name="minLengthUnit"/>
-                  <Option type="double" value="0" name="offsetFromAnchor"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-                  <Option type="double" value="0" name="offsetFromLabel"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" value="false" type="bool"/>
+                  <Option name="enabled" value="0" type="QString"/>
+                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
@@ -25670,99 +21447,72 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="copy" name="QFieldSync/action"/>
-          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
-          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
-          <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 name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" value="0" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" direction="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" maxScaleDenominator="1e+08" spacing="0" diagramOrientation="Up" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penAlpha="255" scaleBasedVisibility="0" showAxis="0" height="15" width="15" opacity="1" enabled="0" labelPlacementMethod="XHeight" barWidth="5" penWidth="0" scaleDependency="Area" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" minimumSize="0">
-          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="35,35,35,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0.26" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="35,35,35,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0.26" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="35,35,35,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0.26" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25770,22 +21520,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" dist="0" placement="0" linePlacementFlags="2" obstacle="0" zIndex="0">
+      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" value="collection" type="QString"/>
           </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" value="0" name="allowedGapsBuffer"/>
-            <Option type="bool" value="false" name="allowedGapsEnabled"/>
-            <Option type="QString" value="" name="allowedGapsLayer"/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -25796,8 +21546,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -25806,8 +21556,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -25816,8 +21566,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -25844,39 +21594,46 @@ def my_form_open(dialog, layer, feature):
         <alias field="races" index="3" name=""/>
         <alias field="day" index="4" name=""/>
       </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="id"/>
+        <policy policy="Duplicate" field="table_set"/>
+        <policy policy="Duplicate" field="label"/>
+        <policy policy="Duplicate" field="races"/>
+        <policy policy="Duplicate" field="day"/>
+      </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="table_set"/>
-        <default applyOnUpdate="0" expression="" field="label"/>
-        <default applyOnUpdate="0" expression="" field="races"/>
-        <default applyOnUpdate="0" expression="" 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" constraints="0" unique_strength="0" field="id" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="table_set" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="label" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="races" exp_strength="0"/>
-        <constraint notnull_strength="0" constraints="0" unique_strength="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="table_set" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="races" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="table_set"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="races"/>
-        <constraint desc="" exp="" field="day"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="table_set" exp="" desc=""/>
+        <constraint field="label" exp="" desc=""/>
+        <constraint field="races" exp="" desc=""/>
+        <constraint field="day" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" type="field" width="-1" name="id"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" type="field" width="-1" name="table_set"/>
-          <column hidden="0" type="field" width="-1" name="label"/>
-          <column hidden="0" type="field" width="-1" name="day"/>
-          <column hidden="0" type="field" width="130" name="races"/>
+          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column name="table_set" width="-1" type="field" hidden="0"/>
+          <column name="label" width="-1" type="field" hidden="0"/>
+          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="races" width="130" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25908,25 +21665,25 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="day" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="table_set"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="table_set" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="label"/>
-        <field reuseLastValue="0" name="races"/>
-        <field reuseLastValue="0" name="table_set"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="label" reuseLastValue="0"/>
+        <field name="races" reuseLastValue="0"/>
+        <field name="table_set" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
@@ -25960,7 +21717,7 @@ def my_form_open(dialog, layer, feature):
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
     <layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
     <layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
-    <layer id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+    <layer id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -26129,7 +21886,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/Marshals</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Routes</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -26154,6 +21911,7 @@ def my_form_open(dialog, layer, feature):
       <CandidatesPoint type="int">16</CandidatesPoint>
       <CandidatesPolygon type="int">30</CandidatesPolygon>
       <CandidatesPolygonPerCM type="double">2.5</CandidatesPolygonPerCM>
+      <DrawLabelMetrics type="bool">false</DrawLabelMetrics>
       <DrawOutlineLabels type="bool">true</DrawOutlineLabels>
       <DrawRectOnly type="bool">false</DrawRectOnly>
       <DrawUnplaced type="bool">false</DrawUnplaced>
@@ -26291,363 +22049,356 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option type="QString" value="" name="name"/>
+      <Option name="name" value="" type="QString"/>
       <Option name="properties"/>
-      <Option type="QString" value="collection" name="type"/>
+      <Option name="type" value="collection" type="QString"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
-    <visibility-preset has-expanded-info="1" name="Access Routes">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
+    <visibility-preset name="Access Routes" has-expanded-info="1">
+      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default" visible="1"/>
+      <layer visible="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" style="default"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default" visible="1"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
+    <visibility-preset name="Ask Me" has-expanded-info="1">
+      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default" visible="1"/>
+      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" style="default"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer visible="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" style="default"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Ask Me"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Cones">
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="1"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
+    <visibility-preset name="Cones" has-expanded-info="1" has-checked-group-info="1">
+      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
+      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Fencing and Cones"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Fencing">
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="1"/>
+      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <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 visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <checked-group-nodes>
+        <checked-group-node id="Map"/>
+        <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/Markers"/>
+        <checked-group-node id="Fencing and Cones"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Fencing" has-expanded-info="1" has-checked-group-info="1">
+      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <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 visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <checked-group-nodes>
+        <checked-group-node id="Map"/>
+        <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/Markers"/>
+        <checked-group-node id="Fencing and Cones"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <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-expanded-info="1" has-checked-group-info="1">
+      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <checked-group-nodes>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <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-expanded-info="1" has-checked-group-info="1">
+      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <checked-group-nodes>
+        <checked-group-node id="Map"/>
+        <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/Markers"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Marshal plan" has-expanded-info="1" has-checked-group-info="1">
+      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <checked-group-nodes>
+        <checked-group-node id="Map"/>
+        <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/Markers"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Routes" has-expanded-info="1" has-checked-group-info="1">
+      <layer visible="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer visible="1" id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1"/>
+      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+      <layer visible="0" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
+      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes/Markers"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Start/Finish" has-expanded-info="1">
+      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
+      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Fencing and Cones"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal map - inset">
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="0"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
+      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="0"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-        <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal map - main">
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
-      <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 expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="0"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal plan">
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="0"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Routes">
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="0"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="0"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Routes"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="1"/>
+      <layer visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default" visible="1"/>
+      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" expanded="1" style="default"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -26669,110 +22420,91 @@ def my_form_open(dialog, layer, feature):
       <role></role>
     </contact>
     <links/>
+    <dates>
+      <date value="2000-01-01T00:00:00" type="Created"/>
+    </dates>
     <author>Timothy Allen</author>
     <creation>2000-01-01T00:00:00</creation>
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout worldFileMap="" printResolution="120" units="mm" name="Marshals">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Marshals" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,210,mm" blendMode="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26780,15 +22512,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" hidePageIfEmpty="0" visibility="1" zValue="6" id="" hideBackgroundIfEmpty="0" position="158.226,6.0007,mm" frame="false" referencePoint="0" size="132.391,187.018,mm" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" blendMode="0" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" groupUuid="" opacity="1" type="65647" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" positionLock="true" sectionHeight="187.018" excludeFromExports="0" sectionWidth="132.391" outlineWidthM="0.3,mm" sectionY="0" sectionX="0" positionOnPage="158.226,6.0007,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" sectionHeight="184.8" type="65647" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" positionOnPage="158.226,6.0007,mm" position="158.226,6.0007,mm" outlineWidthM="0.3,mm" opacity="1" sectionY="0" frame="false" groupUuid="" excludeFromExports="0" hideBackgroundIfEmpty="0" size="132.391,187.018,mm" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" sectionX="0" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" itemRotation="0" hidePageIfEmpty="0" id="" visibility="1" positionLock="true" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" sectionWidth="132.391" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26796,15 +22528,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem columnSpace="2" wrapChar="" fontColor="#000000" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" equalColumnWidth="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" wmsLegendWidth="50" referencePoint="0" outlineWidthM="0.1,mm" id="" lineSpacing="1" symbolAlignment="1" itemRotation="0" minSymbolSize="0" maxSymbolSize="0" symbolHeight="4" zValue="5" type="65642" position="128.508,3.98741,mm" opacity="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" visibility="1" background="true" resizeToContents="1" rasterBorderColor="0,0,0,255" size="19.9422,32,mm" excludeFromExports="0" rasterBorderWidth="0" frame="true" titleAlignment="1" blendMode="0" positionOnPage="128.508,3.98741,mm" legendFilterByAtlas="0" frameJoinStyle="bevel" groupUuid="" symbolWidth="7" boxSpace="2" positionLock="true" splitLayer="0" title="" columnCount="1" wmsLegendHeight="25" rasterBorder="1">
-        <FrameColor red="128" green="128" blue="128" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="5" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="bevel" itemRotation="0" position="128.508,3.98741,mm" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" legendFilterByAtlas="0" outlineWidthM="0.1,mm" positionOnPage="128.508,3.98741,mm" minSymbolSize="0" frame="true" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" groupUuid="" size="19.9422,32,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="7" positionLock="true">
+        <FrameColor blue="128" green="128" red="128" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26812,263 +22544,429 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" bold="0" italic="0" style="Regular" strikethrough="0" underline="0"/>
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="group" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.8805579999999997" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="1" indent="0" name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="1">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.1750019999999992" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" indent="0" name="symbol" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" marginLeft="2" indent="0" name="symbolLabel" alignment="1">
-            <styleFont description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="3.8222239999999998" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="8" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="all_routes" source="./all_routes.shp|layername=all_routes" patch_size="0,0">
+            <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes"/>
-                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
-                  <Option type="int" value="0" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <custom-order enabled="0">
-            <item>all_routes_5833accf_77da_42ef_a24a_197208cd2190</item>
-          </custom-order>
+          <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" visibility="1" zValue="3" mapRotation="0" followPresetName="Marshal map - inset" id="Inset map" position="98.7828,149.027,mm" isTemporal="0" frame="true" referencePoint="0" size="56.5192,54.5647,mm" keepLayerSet="false" blendMode="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.2,mm" labelMargin="0,mm" positionOnPage="98.7828,149.027,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="true" type="65639" positionOnPage="98.7828,149.027,mm" position="98.7828,149.027,mm" outlineWidthM="0.2,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="56.5192,54.5647,mm" mapRotation="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" itemRotation="0" id="Inset map" isTemporal="0" followPresetName="Marshal map - inset" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94555865223922808" xmin="18.37465029319304222" xmax="18.37894504102223436" ymax="-33.94141242425128269"/>
+        <Extent ymax="-33.91207845085496331" xmin="18.42079363057069585" ymin="-33.91622252962687867" xmax="18.42508615219792389"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="0" bottomAnnotationDirection="0" intervalY="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="0" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" intervalX="0" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="0" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="0" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" name="Grid 1" frameAnnotationDistance="1" unit="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0,0,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -27076,45 +22974,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview inverted="0" blendMode="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" centered="1" name="Overview 1" show="1" position="3">
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <ComposerMapOverview uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" name="Overview 1" position="3" centered="1" inverted="0" blendMode="0" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="0,65,170,127" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,102" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,65,170,127" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,102" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,65,170,127" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,102" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27122,9 +23009,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -27132,230 +23019,173 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" visibility="1" zValue="2" mapRotation="0" followPresetName="Marshal map - main" id="Main map" position="3.53,6.0007,mm" isTemporal="0" frame="false" referencePoint="0" size="142,187.018,mm" keepLayerSet="false" blendMode="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="3.53,6.0007,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="false" type="65639" positionOnPage="3.53,6.0007,mm" position="3.53,6.0007,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="142,187.018,mm" mapRotation="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" itemRotation="0" id="Main map" isTemporal="0" followPresetName="Marshal map - main" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94416225303095302" xmin="18.37628384731003806" xmax="18.37731148690523852" ymax="-33.94280882345955774"/>
+        <Extent ymax="-33.91347412623339608" xmin="18.42242633792752926" ymin="-33.9148268542484459" xmax="18.42345344484109049"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="0" bottomAnnotationDirection="0" intervalY="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="0" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" intervalX="0" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="0" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="0" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" name="Grid 1" frameAnnotationDistance="1" unit="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0,0,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{7158b503-47c7-43d8-b863-66e9308bf8c9}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -27363,28 +23193,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../GunRun2022_500.png" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" anchorPoint="0" visibility="1" zValue="1" pictureHeight="25.2491" id="" svgBorderColor="0,0,0,255" position="246.665,178.41,mm" pictureWidth="47.1065" mode="1" frame="false" referencePoint="0" size="47.1065,27.6,mm" resizeMode="0" blendMode="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="246.665,178.41,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="1" background="false" mode="1" type="65640" file="../GunRun2022_500.png" positionOnPage="246.665,178.41,mm" position="246.665,178.41,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="27.4317" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="0" frame="false" groupUuid="" excludeFromExports="0" size="47.1065,27.6,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" northOffset="0" blendMode="0" pictureHeight="27.6">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27392,14 +23222,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame contentMode="1" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" resizeMode="0" type="65648" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;/tr>') %]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" evaluateExpressions="true" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" stylesheetEnabled="true" maxBreakDistance="10" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" url="" useSmartBreaks="true">
+      <LayoutMultiFrame uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" url="" type="65648" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;/tr>') %]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" maxBreakDistance="10" resizeMode="0" evaluateExpressions="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" contentMode="1" stylesheetEnabled="true">
         <childFrame uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27409,134 +23239,112 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="jpg" name="atlasRasterFormat"/>
-          <Option type="int" value="0" name="forceVector"/>
-          <Option type="bool" value="true" name="imageAntialias"/>
-          <Option type="int" value="0" name="imageCropMarginBottom"/>
-          <Option type="int" value="0" name="imageCropMarginLeft"/>
-          <Option type="int" value="0" name="imageCropMarginRight"/>
-          <Option type="int" value="0" name="imageCropMarginTop"/>
-          <Option type="QString" value="0" name="imageCropMarginUnit"/>
-          <Option type="bool" value="false" name="imageCropToContents"/>
-          <Option type="int" value="1" name="pdfAppendGeoreference"/>
-          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
-          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="" name="pdfExportThemes"/>
-          <Option type="int" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" name="pdfLayerOrder"/>
-          <Option type="int" value="0" name="pdfLosslessImages"/>
-          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
-          <Option type="int" value="1" name="pdfSimplify"/>
-          <Option type="int" value="0" name="pdfTextFormat"/>
-          <Option type="QString" value="false" name="rasterize"/>
-          <Option type="QString" value="3.53" name="resizeToContentsBottomMargin"/>
-          <Option type="QString" value="3.53" name="resizeToContentsLeftMargin"/>
-          <Option type="QString" value="3.53" name="resizeToContentsRightMargin"/>
-          <Option type="QString" value="3.53" name="resizeToContentsTopMargin"/>
-          <Option type="bool" value="false" name="singleFile"/>
+          <Option name="atlasRasterFormat" value="jpg" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="bool"/>
+          <Option name="imageCropMarginBottom" value="0" type="int"/>
+          <Option name="imageCropMarginLeft" value="0" type="int"/>
+          <Option name="imageCropMarginRight" value="0" type="int"/>
+          <Option name="imageCropMarginTop" value="0" type="int"/>
+          <Option name="imageCropMarginUnit" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="bool"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="rasterize" value="false" type="QString"/>
+          <Option name="resizeToContentsBottomMargin" value="3.53" type="QString"/>
+          <Option name="resizeToContentsLeftMargin" value="3.53" type="QString"/>
+          <Option name="resizeToContentsRightMargin" value="3.53" type="QString"/>
+          <Option name="resizeToContentsTopMargin" value="3.53" type="QString"/>
+          <Option name="singleFile" value="false" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" sortFeatures="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortKey="&quot;id&quot;" filterFeatures="0" coverageLayerName="marshal_positions" hideCoverage="0" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" pageNameExpression="&quot;position&quot;" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas sortKey="&quot;id&quot;" filterFeatures="0" pageNameExpression="&quot;position&quot;" coverageLayerName="marshal_positions" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayerProvider="ogr" sortAscending="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="1" hideCoverage="0" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortFeatures="1"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="300" units="mm" name="Start &amp; Finish Backgrounds">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Start &amp; Finish Backgrounds" printResolution="300" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,210,mm" blendMode="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{0b05c78e-869d-453c-b1fe-77568dc401f2}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27544,21 +23352,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="arrows/NorthArrow_11.svg" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" anchorPoint="0" visibility="1" zValue="4" pictureHeight="7.97477" id="" svgBorderColor="0,0,0,255" position="286.027,2,mm" pictureWidth="6.31767" mode="0" frame="false" referencePoint="0" size="9.45865,11,mm" resizeMode="0" blendMode="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="330" excludeFromExports="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="286.027,2,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="0" type="65640" file="arrows/NorthArrow_11.svg" positionOnPage="286.027,2,mm" position="286.027,2,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="6.31767" svgFillColor="255,255,255,255" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" anchorPoint="0" frame="false" groupUuid="" excludeFromExports="0" size="9.45865,11,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="330" id="" visibility="1" positionLock="true" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" northOffset="0" blendMode="0" pictureHeight="7.97477">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27566,647 +23374,476 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="270" background="false" frameJoinStyle="miter" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" visibility="1" valign="64" zValue="3" marginX="1" labelText="[%upper( &quot;area&quot; )%]" id="" position="285.027,205.886,mm" frame="false" referencePoint="0" size="142.543,10.3185,mm" blendMode="0" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="285.027,205.886,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65641" labelText="[%upper( &quot;area&quot; )%]" positionOnPage="285.027,205.886,mm" position="285.027,205.886,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="142.543,10.3185,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" itemRotation="270" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem maxBarWidth="150" minBarWidth="50" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" referencePoint="0" outlineWidthM="0.3,mm" id="" labelBarSpace="3" itemRotation="0" lineJoinStyle="miter" unitType="meters" segmentSizeMode="1" zValue="2" boxContentSpace="1" type="65646" numSubdivisions="1" segmentMillimeters="26.3519" position="7,189.669,mm" opacity="1" numUnitsPerSegment="100" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" visibility="1" background="false" numMapUnitsPerScaleBarUnit="1" numSegments="4" height="3" labelHorizontalPlacement="0" subdivisionsHeight="1.5" size="145.54,16.2165,mm" excludeFromExports="0" numSegmentsLeft="2" frame="false" labelVerticalPlacement="0" outlineWidth="0.3" unitLabel="m" blendMode="0" positionOnPage="7,189.669,mm" frameJoinStyle="miter" groupUuid="" positionLock="true" style="Single Box" lineCapStyle="square" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" alignment="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem minBarWidth="50" opacity="1" lineJoinStyle="miter" numSegmentsLeft="2" unitLabel="m" labelVerticalPlacement="0" segmentMillimeters="26.3519" numUnitsPerSegment="100" zValue="2" numSegments="4" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" segmentSizeMode="1" type="65646" subdivisionsHeight="1.5" height="3" numSubdivisions="1" lineCapStyle="square" outlineWidth="0.3" visibility="1" frameJoinStyle="miter" itemRotation="0" numMapUnitsPerScaleBarUnit="1" position="7,189.669,mm" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" outlineWidthM="0.3,mm" positionOnPage="7,189.669,mm" frame="false" referencePoint="0" style="Single Box" unitType="meters" maxBarWidth="150" boxContentSpace="1" id="" background="false" excludeFromExports="0" labelHorizontalPlacement="0" alignment="0" groupUuid="" size="145.54,16.2165,mm" blendMode="0" labelBarSpace="3" positionLock="true">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor red="0" green="0" blue="0" alpha="255"/>
+        <strokeColor blue="0" green="0" red="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="QChar" value="" name="decimal_separator"/>
-            <Option type="int" value="6" name="decimals"/>
-            <Option type="int" value="0" name="rounding_type"/>
-            <Option type="bool" value="false" name="show_plus"/>
-            <Option type="bool" value="true" name="show_thousand_separator"/>
-            <Option type="bool" value="false" name="show_trailing_zeros"/>
-            <Option type="QChar" value="" name="thousand_separator"/>
+            <Option name="decimal_separator" type="invalid"/>
+            <Option name="decimals" value="6" type="int"/>
+            <Option name="rounding_type" value="0" type="int"/>
+            <Option name="show_plus" value="false" type="bool"/>
+            <Option name="show_thousand_separator" value="true" type="bool"/>
+            <Option name="show_trailing_zeros" value="false" type="bool"/>
+            <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor red="0" green="0" blue="0" alpha="255"/>
-        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
+        <fillColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
         <lineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{40c19cdc-b5d8-4c29-b495-91831de94e96}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.3" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.3" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.3" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.3" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.3" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.3" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{89036785-f311-478b-b997-5a2119fbdd2c}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.3" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.3" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.3" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{987cde69-791e-42ba-9c64-bbe76719b954}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" visibility="1" zValue="1" mapRotation="330" followPresetName="Start/Finish" id="" position="7,5.5,mm" isTemporal="0" frame="false" referencePoint="0" size="278.027,180.318,mm" keepLayerSet="false" blendMode="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="7,5.5,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="false" type="65639" positionOnPage="7,5.5,mm" position="7,5.5,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="278.027,180.318,mm" mapRotation="330" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" itemRotation="0" id="" isTemporal="0" followPresetName="Start/Finish" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="rotation" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="field" value="rotation" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="id" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="id" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="angle" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="angle" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90494830469008747" xmin="18.40843143571575169" xmax="18.41790915398017958" ymax="-33.89880140828828559"/>
+        <Extent ymax="-33.89880140828828559" xmin="18.40843143571575169" ymin="-33.90494830469008747" xmax="18.41790915398017958"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="3" bottomAnnotationDirection="0" intervalY="5" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="3" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalX="5" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="3" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="4" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="3" name="Grid 1" frameAnnotationDistance="1" unit="1" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="3" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="1" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="3" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="3" bottomAnnotationPosition="1" annotationFormat="4" intervalX="5" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="3" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="5" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="195,195,195,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="195,195,195,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="195,195,195,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -28223,69 +23860,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28293,139 +23919,117 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="QString" value="0" name="forceVector"/>
-          <Option type="QString" value="true" name="imageAntialias"/>
-          <Option type="QString" value="0" name="imageCropMarginBottom"/>
-          <Option type="QString" value="0" name="imageCropMarginLeft"/>
-          <Option type="QString" value="0" name="imageCropMarginRight"/>
-          <Option type="QString" value="0" name="imageCropMarginTop"/>
-          <Option type="QString" value="false" name="imageCropToContents"/>
-          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="0" name="pdfTextFormat"/>
-          <Option type="QString" value="true" name="singleFile"/>
-          <Option type="QString" value="0" name="svgCropMarginBottom"/>
-          <Option type="QString" value="0" name="svgCropMarginLeft"/>
-          <Option type="QString" value="0" name="svgCropMarginRight"/>
-          <Option type="QString" value="0" name="svgCropMarginTop"/>
-          <Option type="QString" value="true" name="svgCropToContents"/>
-          <Option type="QString" value="0" name="svgDisableRasterTiles"/>
-          <Option type="QString" value="false" name="svgGroupLayers"/>
-          <Option type="QString" value="1" name="svgIncludeMetadata"/>
-          <Option type="QString" value="0" name="svgTextFormat"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="true" type="QString"/>
+          <Option name="svgCropMarginBottom" value="0" type="QString"/>
+          <Option name="svgCropMarginLeft" value="0" type="QString"/>
+          <Option name="svgCropMarginRight" value="0" type="QString"/>
+          <Option name="svgCropMarginTop" value="0" type="QString"/>
+          <Option name="svgCropToContents" value="true" type="QString"/>
+          <Option name="svgDisableRasterTiles" value="0" type="QString"/>
+          <Option name="svgGroupLayers" value="false" type="QString"/>
+          <Option name="svgIncludeMetadata" value="1" type="QString"/>
+          <Option name="svgTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortFeatures="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortKey="area" filterFeatures="0" coverageLayerName="start_finish_area" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;area&quot;" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas sortKey="area" filterFeatures="0" pageNameExpression="&quot;area&quot;" coverageLayerName="start_finish_area" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayerProvider="ogr" sortAscending="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="300" units="mm" name="Fencing">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Fencing" printResolution="300" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,210,mm" blendMode="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{acff6c17-7d68-4552-8826-25f0be803e5b}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28433,15 +24037,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" wrapChar="" fontColor="#000000" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" equalColumnWidth="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" wmsLegendWidth="50" referencePoint="0" outlineWidthM="0.3,mm" id="" lineSpacing="1" symbolAlignment="1" itemRotation="0" minSymbolSize="0" maxSymbolSize="0" symbolHeight="4" zValue="11" type="65642" position="256.808,5.21277,mm" opacity="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" visibility="1" background="true" resizeToContents="0" rasterBorderColor="0,0,0,255" size="38.1563,67.2879,mm" excludeFromExports="0" rasterBorderWidth="0" frame="true" titleAlignment="1" blendMode="0" positionOnPage="256.808,5.21277,mm" legendFilterByAtlas="0" frameJoinStyle="miter" groupUuid="" symbolWidth="7" boxSpace="2" positionLock="true" splitLayer="0" title="" columnCount="1" wmsLegendHeight="25" rasterBorder="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="11" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="256.808,5.21277,mm" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" frame="true" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" groupUuid="" size="38.1563,67.2879,mm" symbolAlignment="1" blendMode="0" resizeToContents="0" symbolWidth="7" positionLock="true">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28449,53 +24053,278 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" bold="1" italic="0" style="Bold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="3" indent="0" name="group" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="group" indent="0" marginTop="3">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="3" indent="0" name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="3">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" marginLeft="2" indent="0" name="symbolLabel" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0" italic="0" style="Regular" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Fencing and Cones">
+          <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="fencing" source="./fencing.shp|layername=fencing" patch_size="0,0">
+            <layer-tree-layer name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_exp="" patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
-                  <Option type="QString" value="" name="legend/expressionFilter"/>
-                  <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
-                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
+                  <Option name="legend/expressionFilter" value="" type="QString"/>
+                  <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="all_routes" source="./all_routes.shp|layername=all_routes" patch_size="0,0">
+            <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
-                  <Option type="int" value="0" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -28503,459 +24332,393 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" visibility="1" valign="32" zValue="10" marginX="0" labelText="FENCING: [% &quot;name&quot; %]" id="" position="6.76779,191.188,mm" frame="false" referencePoint="0" size="148.46,6.45211,mm" blendMode="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="6.76779,191.188,mm" halign="1" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="10" background="false" type="65641" labelText="FENCING: [% &quot;name&quot; %]" positionOnPage="6.76779,191.188,mm" position="6.76779,191.188,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="148.46,6.45211,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" visibility="1" valign="64" zValue="9" marginX="0" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" id="" position="182.723,191.188,mm" frame="false" referencePoint="0" size="56.3557,6.45237,mm" blendMode="0" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="1" outlineWidthM="0.3,mm" positionOnPage="182.723,191.188,mm" halign="2" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="9" background="false" type="65641" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" positionOnPage="182.723,191.188,mm" position="182.723,191.188,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="56.3557,6.45237,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" valign="64" blendMode="0" htmlState="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" visibility="1" valign="32" zValue="8" marginX="0" labelText="REVISION 5.0" id="" position="209.146,198.083,mm" frame="false" referencePoint="0" size="26.8205,6.82826,mm" blendMode="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="209.146,198.083,mm" halign="2" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="REVISION 3.0" positionOnPage="209.146,198.083,mm" position="209.146,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="26.8205,6.82826,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" visibility="1" valign="32" zValue="7" marginX="1" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" id="" position="62.6706,198.083,mm" frame="false" referencePoint="0" size="51.1638,7.07327,mm" blendMode="0" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="62.6706,198.083,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="false" type="65641" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" positionOnPage="62.6706,198.083,mm" position="62.6706,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.1638,7.07327,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" visibility="1" valign="32" zValue="6" marginX="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" id="" position="116.805,198.083,mm" frame="false" referencePoint="0" size="64.7594,7.10512,mm" blendMode="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="116.805,198.083,mm" halign="1" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" positionOnPage="116.805,198.083,mm" position="116.805,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="64.7594,7.10512,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" visibility="1" valign="32" zValue="5" marginX="0" labelText="Page [% @atlas_featurenumber %]" id="" position="6.76779,198.083,mm" frame="false" referencePoint="0" size="52.7903,7.07327,mm" blendMode="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="6.76779,198.083,mm" halign="1" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="Page [% @atlas_featurenumber %]" positionOnPage="6.76779,198.083,mm" position="6.76779,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="52.7903,7.07327,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../GunRun2022_250.png" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" anchorPoint="8" visibility="1" zValue="4" pictureHeight="26.4325" id="" svgBorderColor="0,0,0,255" position="243.098,175.353,mm" pictureWidth="49.3143" mode="1" frame="false" referencePoint="0" size="49.3143,29.8354,mm" resizeMode="0" blendMode="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="243.098,175.353,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="1" type="65640" file="../GunRun2022_250.png" positionOnPage="243.098,175.353,mm" position="243.098,175.353,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="29.6535" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="8" frame="false" groupUuid="" excludeFromExports="0" size="49.3143,29.8354,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" northOffset="0" blendMode="0" pictureHeight="29.8354">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28963,505 +24726,380 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" visibility="1" zValue="3" id="" position="6.91779,197.79,mm" frame="false" referencePoint="0" size="232.01,0.14328,mm" cornerRadiusMeasure="0,mm" blendMode="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" groupUuid="" opacity="1" shapeType="1" type="65643" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="6.91779,197.79,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65643" positionOnPage="6.91779,197.79,mm" position="6.91779,197.79,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="232.01,0.14328,mm" cornerRadiusMeasure="0,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="0,0,0,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="solid" name="outline_style"/>
-              <Option type="QString" value="0.3" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem maxBarWidth="100" minBarWidth="25" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" referencePoint="0" outlineWidthM="0.3,mm" id="" labelBarSpace="1" itemRotation="0" lineJoinStyle="round" unitType="meters" segmentSizeMode="1" zValue="2" boxContentSpace="0.2" type="65646" numSubdivisions="1" segmentMillimeters="33.2496" position="6.76779,2.8482,mm" opacity="1" numUnitsPerSegment="20" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" visibility="1" background="false" numMapUnitsPerScaleBarUnit="1" numSegments="2" height="2" labelHorizontalPlacement="0" subdivisionsHeight="1.5" size="109.51,15.8378,mm" excludeFromExports="0" numSegmentsLeft="2" frame="false" labelVerticalPlacement="0" outlineWidth="0.2" unitLabel="m" blendMode="0" positionOnPage="6.76779,2.8482,mm" frameJoinStyle="miter" groupUuid="" positionLock="true" style="Double Box" lineCapStyle="square" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" alignment="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem minBarWidth="25" opacity="1" lineJoinStyle="round" numSegmentsLeft="2" unitLabel="m" labelVerticalPlacement="0" segmentMillimeters="33.2496" numUnitsPerSegment="20" zValue="2" numSegments="2" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" segmentSizeMode="1" type="65646" subdivisionsHeight="1.5" height="2" numSubdivisions="1" lineCapStyle="square" outlineWidth="0.2" visibility="1" frameJoinStyle="miter" itemRotation="0" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" outlineWidthM="0.3,mm" positionOnPage="6.76779,2.8482,mm" frame="false" referencePoint="0" style="Double Box" unitType="meters" maxBarWidth="100" boxContentSpace="0.2" id="" background="false" excludeFromExports="0" labelHorizontalPlacement="0" alignment="0" groupUuid="" size="109.51,15.8378,mm" blendMode="0" labelBarSpace="1" positionLock="true">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor red="0" green="0" blue="0" alpha="255"/>
+        <strokeColor blue="0" green="0" red="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="QChar" value="" name="decimal_separator"/>
-            <Option type="int" value="6" name="decimals"/>
-            <Option type="int" value="0" name="rounding_type"/>
-            <Option type="bool" value="false" name="show_plus"/>
-            <Option type="bool" value="true" name="show_thousand_separator"/>
-            <Option type="bool" value="false" name="show_trailing_zeros"/>
-            <Option type="QChar" value="" name="thousand_separator"/>
+            <Option name="decimal_separator" type="invalid"/>
+            <Option name="decimals" value="6" type="int"/>
+            <Option name="rounding_type" value="0" type="int"/>
+            <Option name="show_plus" value="false" type="bool"/>
+            <Option name="show_thousand_separator" value="true" type="bool"/>
+            <Option name="show_trailing_zeros" value="false" type="bool"/>
+            <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor red="0" green="0" blue="0" alpha="255"/>
-        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
+        <fillColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
         <lineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.2" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.2" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.2" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.2" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{1f3874ac-6c08-4c55-861c-d829891d3b01}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.2" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.2" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{ae895973-56d3-4fc1-86c6-c98493abf339}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{c0c92035-0ffd-446d-b579-16536dd36b75}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" zValue="1" mapRotation="0" followPresetName="Fencing" id="" position="6.76779,9.35102,mm" isTemporal="0" frame="false" referencePoint="0" size="283.418,180.92,mm" keepLayerSet="false" blendMode="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" groupUuid="" opacity="0.9" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="6.76779,9.35102,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="false" type="65639" positionOnPage="6.76779,9.35102,mm" position="6.76779,9.35102,mm" outlineWidthM="0.3,mm" opacity="0.9" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="283.418,180.92,mm" mapRotation="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" itemRotation="0" id="" isTemporal="0" followPresetName="Fencing" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="Map" name="transformer">
-                    <Option type="Map" name="d">
-                      <Option type="double" value="1" name="exponent"/>
-                      <Option type="double" value="360" name="maxOutput"/>
-                      <Option type="double" value="0" name="maxValue"/>
-                      <Option type="double" value="0" name="minOutput"/>
-                      <Option type="double" value="0" name="minValue"/>
-                      <Option type="double" value="0" name="nullOutput"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="transformer" type="Map">
+                    <Option name="d" type="Map">
+                      <Option name="exponent" value="1" type="double"/>
+                      <Option name="maxOutput" value="360" type="double"/>
+                      <Option name="maxValue" value="0" type="double"/>
+                      <Option name="minOutput" value="0" type="double"/>
+                      <Option name="minValue" value="0" type="double"/>
+                      <Option name="nullOutput" value="0" type="double"/>
                     </Option>
-                    <Option type="int" value="0" name="t"/>
+                    <Option name="t" value="0" type="int"/>
                   </Option>
-                  <Option type="int" value="3" name="type"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="angle" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="angle" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90817940102682115" xmin="18.40368928312333452" xmax="18.40522072458854552" ymax="-33.90720180625844904"/>
+        <Extent ymax="-33.90720180625849167" xmin="18.40368928312333452" ymin="-33.90817940102677852" xmax="18.40522072458854552"/>
         <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>
@@ -29476,138 +25114,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="3" bottomAnnotationDirection="0" intervalY="5" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="3" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalX="5" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="3" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="4" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="3" name="Grid 1" frameAnnotationDistance="1" unit="1" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="3" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="1" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="3" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="3" bottomAnnotationPosition="1" annotationFormat="4" intervalX="5" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="3" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="5" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{e73cb565-3046-4259-89ee-05f5d6c61953}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="195,195,195,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="195,195,195,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="195,195,195,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -29624,69 +25216,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29694,303 +25275,259 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="int" value="0" name="forceVector"/>
-          <Option type="QString" value="true" name="imageAntialias"/>
-          <Option type="QString" value="0" name="imageCropMarginBottom"/>
-          <Option type="QString" value="0" name="imageCropMarginLeft"/>
-          <Option type="QString" value="0" name="imageCropMarginRight"/>
-          <Option type="QString" value="0" name="imageCropMarginTop"/>
-          <Option type="QString" value="false" name="imageCropToContents"/>
-          <Option type="int" value="1" name="pdfAppendGeoreference"/>
-          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
-          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="0" name="pdfExportGeoPdfFeatures"/>
-          <Option type="QString" value="" name="pdfExportThemes"/>
-          <Option type="int" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" name="pdfLayerOrder"/>
-          <Option type="int" value="0" name="pdfLosslessImages"/>
-          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
-          <Option type="int" value="1" name="pdfSimplify"/>
-          <Option type="int" value="0" name="pdfTextFormat"/>
-          <Option type="QString" value="true" name="rasterize"/>
-          <Option type="bool" value="true" name="singleFile"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportGeoPdfFeatures" value="0" type="QString"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="rasterize" value="true" type="QString"/>
+          <Option name="singleFile" value="true" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" sortFeatures="1" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" sortKey="&quot;group&quot;" filterFeatures="0" coverageLayerName="fence_and_cone_groups" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;" coverageLayerProvider="virtual" enabled="1"/>
+      <Atlas sortKey="&quot;group&quot;" filterFeatures="0" pageNameExpression="&quot;name&quot;" coverageLayerName="fence_and_cone_groups" 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" sortAscending="1" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
     </Layout>
-    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" printResolution="144" units="mm" name="Ask Me">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="9" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Ask Me" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="9" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{20578607-b7b1-4298-b229-e8f94e47157a}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,210,mm" blendMode="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide units="mm" orientation="2" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" visibility="1" valign="64" zValue="8" marginX="1" labelText="Directions to Start of Race" id="" position="4.43449,186.634,mm" frame="false" referencePoint="0" size="83.9998,10.4638,mm" blendMode="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" groupUuid="" opacity="1" type="65641" positionLock="false" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="4.43449,186.634,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="Directions to Start of Race" positionOnPage="4.43449,186.634,mm" position="4.43449,186.634,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="83.9998,10.4638,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" itemRotation="0" id="" halign="1" visibility="1" positionLock="false" marginY="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="14" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" visibility="1" valign="32" zValue="7" marginX="1" labelText="Gun Run" id="" position="4.43449,197.498,mm" frame="false" referencePoint="0" size="48.2923,9.511,mm" blendMode="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" groupUuid="" opacity="1" type="65641" positionLock="false" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="4.43449,197.498,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="false" type="65641" labelText="Gun Run" positionOnPage="4.43449,197.498,mm" position="4.43449,197.498,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="48.2923,9.511,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" itemRotation="0" id="" halign="1" visibility="1" positionLock="false" marginY="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem columnSpace="0" wrapChar="" fontColor="#000000" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" equalColumnWidth="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" wmsLegendWidth="50" referencePoint="0" outlineWidthM="0.3,mm" id="" lineSpacing="2" symbolAlignment="1" itemRotation="0" minSymbolSize="0" maxSymbolSize="0" symbolHeight="5" zValue="6" type="65642" position="10.096,10.8563,mm" opacity="1" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" visibility="1" background="true" resizeToContents="1" legendFilterByMap="1" rasterBorderColor="0,0,0,255" size="59.0766,76,mm" excludeFromExports="0" rasterBorderWidth="0" frame="true" titleAlignment="1" blendMode="0" positionOnPage="10.096,10.8563,mm" legendFilterByAtlas="0" frameJoinStyle="round" groupUuid="" symbolWidth="9" boxSpace="2" positionLock="false" splitLayer="0" title="" columnCount="1" wmsLegendHeight="25" rasterBorder="1">
-        <FrameColor red="139" green="139" blue="139" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="6" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" type="65642" legendFilterByMap="1" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="round" itemRotation="0" position="10.096,10.8563,mm" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="10.096,10.8563,mm" minSymbolSize="0" frame="true" symbolHeight="5" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="0" columnSpace="0" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" groupUuid="" size="59.0766,76,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="9" positionLock="false">
+        <FrameColor blue="139" green="139" red="139" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29998,52 +25535,277 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="7.6444479999999997" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="16" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="group" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="subgroup" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2.5" marginLeft="3" indent="0" name="symbolLabel" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" bold="0" italic="0" style="Regular" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbolLabel" indent="0" marginTop="2.5" marginLeft="3">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Ask Me">
+          <layer-tree-group name="Ask Me" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option type="Map">
-                <Option type="QString" value="hidden" name="legend/title-style"/>
+                <Option name="legend/title-style" value="hidden" type="QString"/>
               </Option>
             </customproperties>
-            <layer-tree-layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="poi_labels" source="./poi_labels.shp|layername=poi_labels" patch_size="0,0">
+            <layer-tree-layer name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" legend_exp="" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" value="Start/Finish" name="legend/label-0"/>
-                  <Option type="QString" value="Toilets" name="legend/label-1"/>
-                  <Option type="QString" value="Tog Bag Drop-off" name="legend/label-2"/>
-                  <Option type="QString" value="Road Closed to Cars" name="legend/label-3"/>
-                  <Option type="QString" value="MyCiti Drop-off" name="legend/label-4"/>
-                  <Option type="QString" value="Parking" name="legend/label-5"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option name="legend/label-0" value="Start/Finish" type="QString"/>
+                  <Option name="legend/label-1" value="Toilets" type="QString"/>
+                  <Option name="legend/label-2" value="Tog Bag Drop-off" type="QString"/>
+                  <Option name="legend/label-3" value="Road Closed to Cars" type="QString"/>
+                  <Option name="legend/label-4" value="MyCiti Drop-off" type="QString"/>
+                  <Option name="legend/label-5" value="Parking" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start" patch_size="0,0">
+            <layer-tree-layer name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" legend_exp="" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" value="To 21KM Start (06:30)" name="legend/label-0"/>
-                  <Option type="QString" value="To 10KM Start (07:30)" name="legend/label-1"/>
-                  <Option type="QString" value="To 5KM Start (08:30)" name="legend/label-2"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option name="legend/label-0" value="To 21KM Start (06:30)" type="QString"/>
+                  <Option name="legend/label-1" value="To 10KM Start (07:30)" type="QString"/>
+                  <Option name="legend/label-2" value="To 5KM Start (08:30)" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30051,167 +25813,145 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" visibility="1" valign="32" zValue="5" marginX="1" labelText="REVISION 1.0" id="" position="221.862,190.027,mm" frame="false" referencePoint="0" size="27.7839,6.871,mm" blendMode="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" groupUuid="" opacity="1" type="65641" positionLock="false" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="221.862,190.027,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="REVISION 1.0" positionOnPage="221.862,190.027,mm" position="221.862,190.027,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="27.7839,6.871,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" itemRotation="0" id="" halign="2" visibility="1" positionLock="false" marginY="1" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" visibility="1" valign="64" zValue="4" marginX="1" labelText="Sunday, 20 October 2019" id="" position="197.975,197.498,mm" frame="false" referencePoint="0" size="51.6706,6.60801,mm" blendMode="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" groupUuid="" opacity="1" type="65641" positionLock="false" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="197.975,197.498,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="4" background="false" type="65641" labelText="Sunday, 20 October 2019" positionOnPage="197.975,197.498,mm" position="197.975,197.498,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.6706,6.60801,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" itemRotation="0" id="" halign="2" visibility="1" positionLock="false" marginY="1" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../Gun_Run_Logo.png" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" anchorPoint="4" visibility="1" zValue="3" pictureHeight="24.3824" id="" svgBorderColor="0,0,0,255" position="249.646,179.724,mm" pictureWidth="24.2337" mode="1" frame="false" referencePoint="0" size="42.9838,24.3824,mm" resizeMode="0" blendMode="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="false" pictureRotation="0" excludeFromExports="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="249.646,179.724,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="3" background="false" mode="1" type="65640" file="../Gun_Run_Logo.png" positionOnPage="249.646,179.724,mm" position="249.646,179.724,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="24.2337" svgFillColor="255,255,255,255" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" anchorPoint="4" frame="false" groupUuid="" excludeFromExports="0" size="42.9838,24.3824,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="false" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" northOffset="0" blendMode="0" pictureHeight="24.3824">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30219,96 +25959,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" visibility="1" zValue="2" id="" position="4.58449,197.248,mm" frame="false" referencePoint="0" size="244.912,0.1,mm" cornerRadiusMeasure="0,mm" blendMode="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" groupUuid="" opacity="1" shapeType="1" type="65643" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="4.58449,197.248,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="false" type="65643" positionOnPage="4.58449,197.248,mm" position="4.58449,197.248,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="244.912,0.1,mm" cornerRadiusMeasure="0,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{25dc84af-8724-465b-a42c-c6c013132998}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="0,0,0,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="solid" name="outline_style"/>
-              <Option type="QString" value="0.3" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" zValue="1" mapRotation="0" followPresetName="Ask Me" id="" position="4.43449,6.411,mm" isTemporal="0" frame="false" referencePoint="0" size="288.007,183.616,mm" keepLayerSet="false" blendMode="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" groupUuid="" opacity="1" type="65639" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="4.43449,6.411,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="4.43449,6.411,mm" position="4.43449,6.411,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="288.007,183.616,mm" mapRotation="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" itemRotation="0" id="" isTemporal="0" followPresetName="Ask Me" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="false" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90994364588821952" xmin="18.39762336729721071" xmax="18.41789384089274151" ymax="-33.8970204297764468"/>
+        <Extent ymax="-33.8970204297764468" xmin="18.39762336729721071" ymin="-33.90994364588821952" xmax="18.41789384089274151"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -30323,206 +26052,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="0" bottomAnnotationDirection="0" intervalY="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="0" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalX="0" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="0" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="0" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" name="Grid 1" frameAnnotationDistance="1" unit="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0,0,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30530,373 +26202,318 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="QString" value="0" name="forceVector"/>
-          <Option type="QString" value="true" name="imageAntialias"/>
-          <Option type="QString" value="0" name="imageCropMarginBottom"/>
-          <Option type="QString" value="0" name="imageCropMarginLeft"/>
-          <Option type="QString" value="0" name="imageCropMarginRight"/>
-          <Option type="QString" value="0" name="imageCropMarginTop"/>
-          <Option type="QString" value="false" name="imageCropToContents"/>
-          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="0" name="pdfTextFormat"/>
-          <Option type="QString" value="true" name="singleFile"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas sortFeatures="0" coverageLayer="" filterFeatures="0" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression="" enabled="0"/>
+      <Atlas filterFeatures="0" pageNameExpression="" coverageLayer="" enabled="0" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="144" units="mm" name="Routes">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Routes" printResolution="144" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,210,mm" blendMode="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide units="mm" orientation="2" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" visibility="1" valign="32" zValue="13" marginX="0" labelText="REVISION 5.0" id="" position="200.171,199.082,mm" frame="false" referencePoint="0" size="61.5373,6.8714,mm" blendMode="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="200.171,199.082,mm" halign="2" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="13" background="false" type="65641" labelText="REVISION 1.0" positionOnPage="200.171,199.082,mm" position="200.171,199.082,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="61.5373,6.8714,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" visibility="1" valign="64" zValue="12" marginX="0" labelText="Gun Run 2022: [%&quot;Source&quot;%]" id="" position="9.7863,192.073,mm" frame="false" referencePoint="0" size="61.5373,6.60801,mm" blendMode="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="9.7863,192.073,mm" halign="1" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="12" background="false" type="65641" labelText="Gun Run 2023: [%&quot;Source&quot;%]" positionOnPage="9.7863,192.073,mm" position="9.7863,192.073,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="61.5373,6.60801,mm" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" visibility="1" valign="32" zValue="11" marginX="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" id="" position="9.7863,199.082,mm" frame="false" referencePoint="0" size="61.5373,6.60801,mm" blendMode="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="9.7863,199.082,mm" halign="1" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="11" background="false" type="65641" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" positionOnPage="9.7863,199.082,mm" position="9.7863,199.082,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="61.5373,6.60801,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../GunRun2022_250.png" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" anchorPoint="4" visibility="1" zValue="10" pictureHeight="15.9472" id="" svgBorderColor="0,0,0,255" position="262.196,188.218,mm" pictureWidth="29.7523" mode="1" frame="false" referencePoint="0" size="29.7523,17.4718,mm" resizeMode="0" blendMode="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="0" excludeFromExports="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="262.196,188.218,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="10" background="false" mode="1" type="65640" file="../GunRun2023_250.png" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="29.7523" svgFillColor="255,255,255,255" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" anchorPoint="4" frame="false" groupUuid="" excludeFromExports="0" size="29.7523,17.4718,mm" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" northOffset="0" blendMode="0" pictureHeight="16.8993">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30904,532 +26521,464 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" visibility="1" zValue="9" id="" position="9.57644,198.832,mm" frame="false" referencePoint="0" size="251.982,0.1,mm" cornerRadiusMeasure="0,mm" blendMode="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" groupUuid="" opacity="1" shapeType="1" type="65643" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="9.57644,198.832,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="9" background="false" type="65643" positionOnPage="9.57644,198.832,mm" position="9.57644,198.832,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="251.982,0.1,mm" cornerRadiusMeasure="0,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{04656074-3faa-4640-ae80-a44a8cb036f7}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="0,0,0,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="solid" name="outline_style"/>
-              <Option type="QString" value="0.3" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" visibility="1" zValue="8" mapRotation="0" followPresetName="Routes" id="Trail Finish" position="9.57644,5.42566,mm" isTemporal="0" frame="true" referencePoint="0" size="107.861,186.385,mm" keepLayerSet="false" blendMode="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="9.57644,5.42566,mm" drawCanvasItems="true">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="true" type="65639" positionOnPage="9.57644,5.42566,mm" position="9.57644,5.42566,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="107.861,186.385,mm" mapRotation="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" itemRotation="0" id="Trail Finish" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.93243205975926458" xmin="18.39314911415855391" xmax="18.41187375074135701" ymax="-33.90007566747966905"/>
+        <Extent ymax="-33.90007566747966905" xmin="18.39314911415855391" ymin="-33.93243205975926458" xmax="18.41187375074135701"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="1" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" visibility="1" zValue="7" mapRotation="0" followPresetName="Routes" id="Trail Start" position="112.643,4.09761,mm" isTemporal="0" frame="true" referencePoint="0" size="179.156,189.279,mm" keepLayerSet="false" blendMode="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="112.643,4.09761,mm" drawCanvasItems="true">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="true" type="65639" positionOnPage="112.643,4.09761,mm" position="112.643,4.09761,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="179.156,189.279,mm" mapRotation="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" itemRotation="0" id="Trail Start" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95772328900195447" xmin="18.3924263991010406" xmax="18.42354248737832023" ymax="-33.92484901666441743"/>
+        <Extent ymax="-33.92484901666441743" xmin="18.3924263991010406" ymin="-33.95772328900195447" xmax="18.42354248737832023"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="1" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" visibility="1" zValue="6" mapRotation="0" followPresetName="Routes" id="Left inset 21KM" position="5.86559,4.09761,mm" isTemporal="0" frame="true" referencePoint="0" size="67.7828,166.874,mm" keepLayerSet="false" blendMode="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="true" type="65639" positionOnPage="5.86559,4.09761,mm" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="67.7828,166.874,mm" mapRotation="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" itemRotation="0" id="Left inset 21KM" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94700000000000273" xmin="18.37399999999999878" xmax="18.38626092146919788" ymax="-33.91681492292400435"/>
+        <Extent ymax="-33.91681492292400435" xmin="18.37399999999999878" ymin="-33.94700000000000273" xmax="18.38626092146919788"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" visibility="1" zValue="5" mapRotation="0" followPresetName="Routes" id="Bottom inset 21KM" position="133.191,119.125,mm" isTemporal="0" frame="true" referencePoint="0" size="113.3,76.1023,mm" keepLayerSet="false" blendMode="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="133.191,119.125,mm" drawCanvasItems="true">
-        <FrameColor red="103" green="34" blue="144" alpha="255"/>
-        <BackgroundColor red="200" green="175" blue="215" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="true" type="65639" positionOnPage="133.191,119.125,mm" position="133.191,119.125,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="113.3,76.1023,mm" mapRotation="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" itemRotation="0" id="Bottom inset 21KM" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" followPreset="true" blendMode="0">
+        <FrameColor blue="144" green="34" red="103" alpha="255"/>
+        <BackgroundColor blue="215" green="175" red="200" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.9168317482614512" xmin="18.41509620662891678" xmax="18.42329132157224336" ymax="-33.91132718340826813"/>
+        <Extent ymax="-33.91132718340826813" xmin="18.41509620662891678" ymin="-33.9168317482614512" xmax="18.42329132157224336"/>
         <LayerSet/>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="1" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" visibility="0" zValue="4" mapRotation="0" followPresetName="Routes" id="End inset Trail" position="19.6693,7.89412,mm" isTemporal="0" frame="true" referencePoint="0" size="68.3676,117.12,mm" keepLayerSet="false" blendMode="0" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="19.6693,7.89412,mm" drawCanvasItems="true">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="4" background="true" type="65639" positionOnPage="19.6693,7.89412,mm" position="19.6693,7.89412,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="68.3676,117.12,mm" mapRotation="0" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" itemRotation="0" id="End inset Trail" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="0" positionLock="true" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.91454383501641701" xmin="18.4044900556177744" xmax="18.41240136424316276" ymax="-33.90099106513847005"/>
+        <Extent ymax="-33.90099106513847005" xmin="18.4044900556177744" ymin="-33.91454383501641701" xmax="18.41240136424316276"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="1" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" visibility="0" zValue="3" mapRotation="0" followPresetName="Routes" id="Start inset Trail" position="170.062,49.6297,mm" isTemporal="0" frame="true" referencePoint="0" size="63.655,88.3012,mm" keepLayerSet="false" blendMode="0" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="170.062,49.6297,mm" drawCanvasItems="true">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="true" type="65639" positionOnPage="170.062,49.6297,mm" position="170.062,49.6297,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="63.655,88.3012,mm" mapRotation="0" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" itemRotation="0" id="Start inset Trail" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="0" positionLock="true" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94823764719958348" xmin="18.41445559427620893" xmax="18.4185691326545431" ymax="-33.94253141264477591"/>
+        <Extent ymax="-33.94253141264477591" xmin="18.41445559427620893" ymin="-33.94823764719958348" xmax="18.4185691326545431"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="1" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" visibility="0" zValue="2" mapRotation="0" followPresetName="Routes" id="Contour inset Trail" position="200.321,125.314,mm" isTemporal="0" frame="true" referencePoint="0" size="75.8756,69.7635,mm" keepLayerSet="false" blendMode="0" uuid="{917a530c-14f4-4ed8-b109-961939435221}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="200.321,125.314,mm" drawCanvasItems="true">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="true" type="65639" positionOnPage="200.321,125.314,mm" position="200.321,125.314,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="75.8756,69.7635,mm" mapRotation="0" uuid="{917a530c-14f4-4ed8-b109-961939435221}" itemRotation="0" id="Contour inset Trail" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="0" positionLock="true" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95702588572736147" xmin="18.41234259163472942" xmax="18.42332635419156972" ymax="-33.94692690566557047"/>
+        <Extent ymax="-33.94692690566557047" xmin="18.41234259163472942" ymin="-33.95702588572736147" xmax="18.42332635419156972"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="1" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="round" mapFlags="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" visibility="1" zValue="1" mapRotation="0" followPresetName="Routes" id="Main Map" position="9.50144,5.50066,mm" isTemporal="0" frame="true" referencePoint="0" size="282.372,186.105,mm" keepLayerSet="false" blendMode="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" groupUuid="" opacity="1" type="65639" positionLock="false" excludeFromExports="0" outlineWidthM="0.15,mm" labelMargin="0,mm" positionOnPage="9.50144,5.50066,mm" drawCanvasItems="true">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="round" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="9.50144,5.50066,mm" position="9.50144,5.50066,mm" outlineWidthM="0.15,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="282.372,186.105,mm" mapRotation="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" itemRotation="0" id="Main Map" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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.392'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.392'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95900000000000318" xmin="18.36400000000000077" xmax="18.45388998618362919" ymax="-33.89975544251798567"/>
+        <Extent ymax="-33.89975544251812778" xmin="18.36400000000000077" ymin="-33.95900000000000318" xmax="18.45388998618362919"/>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="0" bottomAnnotationDirection="0" intervalY="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="0" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalX="0" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="0" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="0" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" name="Grid 1" frameAnnotationDistance="1" unit="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0,0,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{53251229-a00c-4ec1-9df9-51bea540c4e3}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31437,51 +26986,40 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview inverted="0" blendMode="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" centered="0" name="Overview 1" show="1" position="3">
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <ComposerMapOverview uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" name="Overview 1" position="3" centered="0" inverted="0" blendMode="0" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="alpha">
-                    <Option type="bool" value="true" name="active"/>
-                    <Option type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression"/>
-                    <Option type="int" value="3" name="type"/>
+                <Option name="name" value="" type="QString"/>
+                <Option name="properties" type="Map">
+                  <Option name="alpha" type="Map">
+                    <Option name="active" value="true" type="bool"/>
+                    <Option name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString"/>
+                    <Option name="type" value="3" type="int"/>
                   </Option>
                 </Option>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{c70687b6-ebcb-4a4f-9196-528667fd884e}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="103,34,144,26" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="103,34,144,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="103,34,144,26" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="103,34,144,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="103,34,144,26" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="103,34,144,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31489,9 +27027,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31499,137 +27037,115 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="2" margin="0.06" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.06" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="int" value="0" name="forceVector"/>
-          <Option type="QString" value="true" name="imageAntialias"/>
-          <Option type="QString" value="0" name="imageCropMarginBottom"/>
-          <Option type="QString" value="0" name="imageCropMarginLeft"/>
-          <Option type="QString" value="0" name="imageCropMarginRight"/>
-          <Option type="QString" value="0" name="imageCropMarginTop"/>
-          <Option type="QString" value="false" name="imageCropToContents"/>
-          <Option type="int" value="1" name="pdfAppendGeoreference"/>
-          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
-          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="" name="pdfExportThemes"/>
-          <Option type="int" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" name="pdfLayerOrder"/>
-          <Option type="int" value="0" name="pdfLosslessImages"/>
-          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
-          <Option type="int" value="1" name="pdfSimplify"/>
-          <Option type="int" value="0" name="pdfTextFormat"/>
-          <Option type="QString" value="true" name="singleFile"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortKey="&quot;Sort&quot;" filterFeatures="1" coverageLayerName="all_routes" hideCoverage="0" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" pageNameExpression="&quot;Distance&quot;" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas sortKey="&quot;Sort&quot;" filterFeatures="1" pageNameExpression="&quot;Distance&quot;" coverageLayerName="all_routes" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerProvider="ogr" sortAscending="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="1" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="120" units="mm" name="Marshal Plan A1">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Marshal Plan A1" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{65fd4b73-0525-4952-b52a-060921d10d24}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="594,841,mm" blendMode="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="594,841,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{ca38df31-0d5f-4457-be79-18d8add56004}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31637,15 +27153,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" wrapChar="" fontColor="#000000" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" equalColumnWidth="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" wmsLegendWidth="50" referencePoint="0" outlineWidthM="0.3,mm" id="" lineSpacing="1" symbolAlignment="1" itemRotation="0" minSymbolSize="0" maxSymbolSize="0" symbolHeight="4" zValue="8" type="65642" position="25.5925,18.7971,mm" opacity="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" visibility="1" background="true" resizeToContents="1" rasterBorderColor="0,0,0,255" size="4,4,mm" excludeFromExports="0" rasterBorderWidth="0" frame="false" titleAlignment="1" blendMode="0" positionOnPage="25.5925,18.7971,mm" legendFilterByAtlas="0" frameJoinStyle="miter" groupUuid="" symbolWidth="7" boxSpace="2" positionLock="true" splitLayer="0" title="" columnCount="1" wmsLegendHeight="25" rasterBorder="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="8" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="25.5925,18.7971,mm" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="25.5925,18.7971,mm" minSymbolSize="0" frame="false" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" groupUuid="" size="4,4,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="7" positionLock="true">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31653,37 +27169,262 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.6444479999999997" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="16" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="group" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="1" indent="0" name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="1">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" indent="0" name="symbol" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" marginLeft="2" indent="0" name="symbolLabel" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer expanded="1" id="all_routes20170907054841602" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="all_routes" patch_size="0,0">
+            <layer-tree-layer name="all_routes" id="all_routes20170907054841602" expanded="1" legend_exp="" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" name="expandedLegendNodes"/>
-                  <Option type="QString" value="1,2,3" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
-                  <Option type="QString" value="0" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString"/>
+                  <Option name="legend/node-order" value="1,2,3" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -31691,240 +27432,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" visibility="1" valign="64" zValue="7" marginX="1" labelText="MARSHAL POSITIONS" id="" position="5.2963,808.939,mm" frame="false" referencePoint="0" size="91.9494,15.0649,mm" blendMode="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="5.2963,808.939,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="false" type="65641" labelText="MARSHAL POSITIONS" positionOnPage="5.2963,808.939,mm" position="5.2963,808.939,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="91.9494,15.0649,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" visibility="1" valign="32" zValue="5" marginX="1" labelText="REVISION 1.2" id="" position="430.403,825.052,mm" frame="false" referencePoint="0" size="56.6212,15.3656,mm" blendMode="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="430.403,825.052,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="REVISION 1.2" positionOnPage="430.403,825.052,mm" position="430.403,825.052,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="56.6212,15.3656,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" visibility="1" valign="64" zValue="4" marginX="1" labelText="Sunday, 20 October 2019" id="" position="372.175,808.942,mm" frame="false" referencePoint="0" size="114.848,15.0635,mm" blendMode="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="372.175,808.942,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="4" background="false" type="65641" labelText="Sunday, 20 October 2019" positionOnPage="372.175,808.942,mm" position="372.175,808.942,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="114.848,15.0635,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../Gun_Run_Logo.png" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" anchorPoint="8" visibility="1" zValue="3" pictureHeight="63.9757" id="" svgBorderColor="0,0,0,255" position="489.557,775.395,mm" pictureWidth="63.5856" mode="1" frame="false" referencePoint="0" size="100.498,63.9757,mm" resizeMode="0" blendMode="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="489.557,775.395,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="3" background="false" mode="1" type="65640" file="../Gun_Run_Logo.png" positionOnPage="489.557,775.395,mm" position="489.557,775.395,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="63.5856" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="8" frame="false" groupUuid="" excludeFromExports="0" size="100.498,63.9757,mm" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" northOffset="0" blendMode="0" pictureHeight="63.9757">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31932,232 +27640,199 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" visibility="1" zValue="2" id="" position="5.4463,824.155,mm" frame="false" referencePoint="0" size="481.428,0.606138,mm" cornerRadiusMeasure="0,mm" blendMode="0" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" groupUuid="" opacity="1" shapeType="1" type="65643" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="5.4463,824.155,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="false" type="65643" positionOnPage="5.4463,824.155,mm" position="5.4463,824.155,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="481.428,0.606138,mm" cornerRadiusMeasure="0,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="0,0,0,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="solid" name="outline_style"/>
-              <Option type="QString" value="0.3" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" visibility="1" zValue="1" mapRotation="0" followPresetName="Marshal plan" id="" position="3.94474,5.25965,mm" isTemporal="0" frame="true" referencePoint="0" size="584.759,811.213,mm" keepLayerSet="false" blendMode="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="3.94474,5.25965,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="3.94474,5.25965,mm" position="3.94474,5.25965,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="584.759,811.213,mm" mapRotation="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" itemRotation="0" id="" isTemporal="0" followPresetName="Marshal plan" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95821655848814657" xmin="18.37434415142052657" xmax="18.42299397558693741" ymax="-33.89072661913806428"/>
+        <Extent ymax="-33.89072661913806428" xmin="18.37434415142052657" ymin="-33.95821655848814657" xmax="18.42299397558693741"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="QString" value="0" name="forceVector"/>
-          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" sortFeatures="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortKey="page" filterFeatures="0" coverageLayerName="complete_marshal_overview" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" coverageLayerProvider="virtual" enabled="1"/>
+      <Atlas sortKey="page" filterFeatures="0" pageNameExpression="&quot;page&quot;" coverageLayerName="complete_marshal_overview" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerProvider="virtual" sortAscending="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="144" units="mm" name="Access Roads">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Access Roads" printResolution="144" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,210,mm" blendMode="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{038e2492-f412-42ba-8703-4c8f318a87c2}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide units="mm" orientation="2" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem columnSpace="2" wrapChar="" fontColor="#000000" equalColumnWidth="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" wmsLegendWidth="50" referencePoint="0" outlineWidthM="0.3,mm" id="" lineSpacing="1" symbolAlignment="1" itemRotation="0" minSymbolSize="0" maxSymbolSize="0" symbolHeight="4" zValue="15" type="65642" position="244.484,130.172,mm" opacity="1" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" visibility="1" background="true" resizeToContents="1" rasterBorderColor="0,0,0,255" size="34.45,40.8,mm" excludeFromExports="0" rasterBorderWidth="0" frame="true" titleAlignment="1" blendMode="0" positionOnPage="244.484,130.172,mm" legendFilterByAtlas="0" frameJoinStyle="miter" groupUuid="" symbolWidth="7" boxSpace="2" positionLock="true" splitLayer="0" title="" columnCount="1" wmsLegendHeight="25" rasterBorder="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="185"/>
+      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="15" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="244.484,130.172,mm" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="244.484,130.172,mm" minSymbolSize="0" frame="true" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="0" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" groupUuid="" size="34.45,40.8,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="7" positionLock="true">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="185"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32165,35 +27840,260 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="3" indent="0" name="group" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="group" indent="0" marginTop="3">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="3" indent="0" name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="3">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" marginLeft="2" indent="0" name="symbolLabel" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0" italic="0" style="Regular" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Residents Access">
+          <layer-tree-group name="Residents Access" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads" patch_size="0,0">
+            <layer-tree-layer name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" legend_exp="" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -32201,240 +28101,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" visibility="1" valign="64" zValue="8" marginX="0" labelText="ACCESS ROUTES FOR RESIDENTS" id="" position="9.37446,191.81,mm" frame="false" referencePoint="0" size="194.851,7.272,mm" blendMode="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="9.37446,191.81,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="ACCESS ROUTES FOR RESIDENTS" positionOnPage="9.37446,191.81,mm" position="9.37446,191.81,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="194.851,7.272,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="14" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" visibility="1" valign="64" zValue="6" marginX="1" labelText="REVISION 1.1" id="" position="204.225,191.81,mm" frame="false" referencePoint="0" size="57.4836,6.8714,mm" blendMode="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="204.225,191.81,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="REVISION 1.1" positionOnPage="204.225,191.81,mm" position="204.225,191.81,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="57.4836,6.8714,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" visibility="1" valign="64" zValue="5" marginX="1" labelText="Sunday, 20 October 2019" id="" position="210.038,199.082,mm" frame="false" referencePoint="0" size="51.6706,6.60801,mm" blendMode="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="210.038,199.082,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="Sunday, 20 October 2019" positionOnPage="210.038,199.082,mm" position="210.038,199.082,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.6706,6.60801,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../Gun_Run_Logo.png" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" anchorPoint="4" visibility="1" zValue="4" pictureHeight="17.4718" id="" svgBorderColor="0,0,0,255" position="262.196,188.218,mm" pictureWidth="17.3653" mode="1" frame="false" referencePoint="0" size="29.7523,17.4718,mm" resizeMode="0" blendMode="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="0" excludeFromExports="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="262.196,188.218,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="1" type="65640" file="../Gun_Run_Logo.png" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="17.3653" svgFillColor="255,255,255,255" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" anchorPoint="4" frame="false" groupUuid="" excludeFromExports="0" size="29.7523,17.4718,mm" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" northOffset="0" blendMode="0" pictureHeight="17.4718">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32442,111 +28309,100 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" visibility="1" zValue="3" id="" position="9.59946,198.832,mm" frame="false" referencePoint="0" size="251.959,0.1,mm" cornerRadiusMeasure="0,mm" blendMode="0" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" groupUuid="" opacity="1" shapeType="1" type="65643" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="9.59946,198.832,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65643" positionOnPage="9.59946,198.832,mm" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="251.959,0.1,mm" cornerRadiusMeasure="0,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{5ba70802-6163-45fd-99da-6e7d106e21ac}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="0,0,0,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="solid" name="outline_style"/>
-              <Option type="QString" value="0.3" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" visibility="1" zValue="2" mapRotation="0" followPresetName="Access Routes" id="" position="5.86559,4.09761,mm" isTemporal="0" frame="true" referencePoint="0" size="67.7828,166.874,mm" keepLayerSet="false" blendMode="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="true" type="65639" positionOnPage="5.86559,4.09761,mm" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="67.7828,166.874,mm" mapRotation="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" itemRotation="0" id="" isTemporal="0" followPresetName="Access Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="int" value="1" name="type"/>
-                  <Option type="QString" value="" name="val"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="type" value="1" type="int"/>
+                  <Option name="val" value="" type="QString"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94652930000000168" xmin="18.37288570000000121" xmax="18.38563681624126289" ymax="-33.91513741583252539"/>
+        <Extent ymax="-33.91513741583252539" xmin="18.37288570000000121" ymin="-33.94652930000000168" xmax="18.38563681624126289"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -32561,206 +28417,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="0" bottomAnnotationDirection="0" intervalY="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="0" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" intervalX="0" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="0" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="0" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" name="Grid 1" frameAnnotationDistance="1" unit="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0,0,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32768,45 +28567,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="round" mapFlags="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" visibility="1" zValue="1" mapRotation="0" followPresetName="Access Routes" id="" position="9.44946,9.08557,mm" isTemporal="0" frame="true" referencePoint="0" size="282.012,175.592,mm" keepLayerSet="false" blendMode="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.15,mm" labelMargin="0,mm" positionOnPage="9.44946,9.08557,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="round" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="9.44946,9.08557,mm" position="9.44946,9.08557,mm" outlineWidthM="0.15,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="282.012,175.592,mm" mapRotation="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" itemRotation="0" id="" isTemporal="0" followPresetName="Access Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.92999999999999972" xmin="18.37000000000000099" xmax="18.42303507276415431" ymax="-33.89697816224119009"/>
+        <Extent ymax="-33.89697816224119009" xmin="18.37000000000000099" ymin="-33.92999999999999972" xmax="18.42303507276415431"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -32821,206 +28620,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="0" bottomAnnotationDirection="0" intervalY="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="0" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalX="0" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="0" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="0" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" name="Grid 1" frameAnnotationDistance="1" unit="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{ebfdf781-190f-4651-9709-789cb68c9533}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0,0,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33028,373 +28770,318 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="QString" value="0" name="forceVector"/>
-          <Option type="QString" value="true" name="imageAntialias"/>
-          <Option type="QString" value="0" name="imageCropMarginBottom"/>
-          <Option type="QString" value="0" name="imageCropMarginLeft"/>
-          <Option type="QString" value="0" name="imageCropMarginRight"/>
-          <Option type="QString" value="0" name="imageCropMarginTop"/>
-          <Option type="QString" value="false" name="imageCropToContents"/>
-          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="0" name="pdfTextFormat"/>
-          <Option type="QString" value="false" name="singleFile"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0" coverageLayerName="residents_access" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas filterFeatures="0" pageNameExpression="&quot;FID&quot;" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="1" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0"/>
     </Layout>
-    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" printResolution="144" units="mm" name="Golf Course Access">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Golf Course Access" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{c6a999b7-046a-4375-b775-24bfc19b454c}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,210,mm" blendMode="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{cef79093-d3c5-4edf-9190-66f460844f01}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide units="mm" orientation="2" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" visibility="1" valign="64" zValue="8" marginX="0" labelText="Access to P9 Parking and VIP Tent" id="" position="9.37446,191.81,mm" frame="false" referencePoint="0" size="194.851,7.272,mm" blendMode="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="9.37446,191.81,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="Access to P9 Parking and VIP Tent" positionOnPage="9.37446,191.81,mm" position="9.37446,191.81,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="194.851,7.272,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="14" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" visibility="1" valign="64" zValue="6" marginX="1" labelText="REVISION 1.0" id="" position="204.225,191.81,mm" frame="false" referencePoint="0" size="57.4836,6.8714,mm" blendMode="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="204.225,191.81,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="REVISION 1.0" positionOnPage="204.225,191.81,mm" position="204.225,191.81,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="57.4836,6.8714,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" visibility="1" valign="64" zValue="5" marginX="1" labelText="Sunday, 20 October 2019" id="" position="210.038,199.082,mm" frame="false" referencePoint="0" size="51.6706,6.60801,mm" blendMode="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="210.038,199.082,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="Sunday, 20 October 2019" positionOnPage="210.038,199.082,mm" position="210.038,199.082,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.6706,6.60801,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../Gun_Run_Logo.png" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" anchorPoint="4" visibility="1" zValue="4" pictureHeight="17.4718" id="" svgBorderColor="0,0,0,255" position="262.196,188.218,mm" pictureWidth="17.3653" mode="1" frame="false" referencePoint="0" size="29.7523,17.4718,mm" resizeMode="0" blendMode="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="262.196,188.218,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="1" type="65640" file="../Gun_Run_Logo.png" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="17.3653" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="4" frame="false" groupUuid="" excludeFromExports="0" size="29.7523,17.4718,mm" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" northOffset="0" blendMode="0" pictureHeight="17.4718">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33402,96 +29089,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" visibility="1" zValue="3" id="" position="9.59946,198.832,mm" frame="false" referencePoint="0" size="251.959,0.1,mm" cornerRadiusMeasure="0,mm" blendMode="0" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" groupUuid="" opacity="1" shapeType="1" type="65643" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="9.59946,198.832,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65643" positionOnPage="9.59946,198.832,mm" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="251.959,0.1,mm" cornerRadiusMeasure="0,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{025604c1-b118-4f15-b140-54c9145260c4}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="0,0,0,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="solid" name="outline_style"/>
-              <Option type="QString" value="0.3" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="false" frameJoinStyle="round" mapFlags="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" visibility="1" zValue="1" mapRotation="0" followPresetName="" id="" position="9.44946,7.25098,mm" isTemporal="0" frame="false" referencePoint="0" size="282.012,182.649,mm" keepLayerSet="false" blendMode="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" groupUuid="" opacity="1" type="65639" positionLock="false" excludeFromExports="0" outlineWidthM="0.15,mm" labelMargin="0,mm" positionOnPage="9.44946,7.25098,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="round" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="9.44946,7.25098,mm" position="9.44946,7.25098,mm" outlineWidthM="0.15,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="282.012,182.649,mm" mapRotation="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" itemRotation="0" id="" isTemporal="0" followPresetName="" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="false" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" followPreset="false" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="true" name="active"/>
-                  <Option 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" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90848231674397084" xmin="18.40103928699269886" xmax="18.40919746780259914" ymax="-33.90319854486631357"/>
+        <Extent ymax="-33.90319854486631357" xmin="18.40103928699269886" ymin="-33.90848231674397084" xmax="18.40919746780259914"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -33506,206 +29182,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="0" bottomAnnotationDirection="0" intervalY="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="0" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalX="0" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="0" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="0" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" name="Grid 1" frameAnnotationDistance="1" unit="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{260fd874-7bf9-43a4-af33-127e7baa77e4}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0,0,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="0,0,0,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33713,130 +29332,108 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="QString" value="0" name="forceVector"/>
-          <Option type="QString" value="true" name="imageAntialias"/>
-          <Option type="QString" value="0" name="imageCropMarginBottom"/>
-          <Option type="QString" value="0" name="imageCropMarginLeft"/>
-          <Option type="QString" value="0" name="imageCropMarginRight"/>
-          <Option type="QString" value="0" name="imageCropMarginTop"/>
-          <Option type="QString" value="false" name="imageCropToContents"/>
-          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="0" name="pdfTextFormat"/>
-          <Option type="QString" value="false" name="singleFile"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0" coverageLayerName="residents_access" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" enabled="0"/>
+      <Atlas filterFeatures="0" pageNameExpression="&quot;FID&quot;" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="120" units="mm" name="Marshal Plan">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Marshal Plan" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,420,mm" blendMode="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,420,mm" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{c29f549e-9e76-462f-a0fb-b0827382e76d}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -33844,161 +29441,139 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" visibility="1" valign="32" zValue="9" marginX="0" labelText="Page [% &quot;page&quot; %] " id="" position="112.086,406.476,mm" frame="false" referencePoint="0" size="23.5967,8.3142,mm" blendMode="0" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="1" outlineWidthM="0.3,mm" positionOnPage="112.086,406.476,mm" halign="4" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="9" background="false" type="65641" labelText="Page [% &quot;page&quot; %] " positionOnPage="112.086,406.476,mm" position="112.086,406.476,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="23.5967,8.3142,mm" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" itemRotation="0" id="" halign="4" visibility="1" positionLock="true" marginY="1" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" valign="32" blendMode="0" htmlState="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" visibility="1" valign="32" zValue="8" marginX="0" labelText="REVISION 5.0" id="" position="214.292,406.874,mm" frame="false" referencePoint="0" size="27.7839,7.51682,mm" blendMode="0" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="214.292,406.874,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="REVISION 5.0" positionOnPage="214.292,406.874,mm" position="214.292,406.874,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="27.7839,7.51682,mm" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem columnSpace="2" wrapChar="" fontColor="#000000" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" equalColumnWidth="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" wmsLegendWidth="50" referencePoint="0" outlineWidthM="0.3,mm" id="" lineSpacing="1" symbolAlignment="1" itemRotation="0" minSymbolSize="0" maxSymbolSize="0" symbolHeight="4" zValue="7" type="65642" position="15.6525,12.5708,mm" opacity="1" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" visibility="1" background="true" resizeToContents="1" rasterBorderColor="0,0,0,255" size="21.6797,33,mm" excludeFromExports="0" rasterBorderWidth="0" frame="false" titleAlignment="1" blendMode="0" positionOnPage="15.6525,12.5708,mm" legendFilterByAtlas="0" frameJoinStyle="miter" groupUuid="" symbolWidth="7" boxSpace="2" positionLock="true" splitLayer="0" title="" columnCount="1" wmsLegendHeight="25" rasterBorder="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="7" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="15.6525,12.5708,mm" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="15.6525,12.5708,mm" minSymbolSize="0" frame="false" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" groupUuid="" size="21.6797,33,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="7" positionLock="true">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34006,37 +29581,262 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.6444479999999997" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="16" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="group" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="1" indent="0" name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="1">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" indent="0" name="symbol" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" marginLeft="2" indent="0" name="symbolLabel" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="all_routes" source="./all_routes.shp|layername=all_routes" patch_size="0,0">
+            <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
-                  <Option type="int" value="0" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -34044,240 +29844,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" visibility="1" valign="64" zValue="6" marginX="0" labelText="MARSHAL POSITIONS" id="" position="5.69321,398.344,mm" frame="false" referencePoint="0" size="45.1194,8.13137,mm" blendMode="0" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="5.69321,398.344,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="MARSHAL POSITIONS" positionOnPage="5.69321,398.344,mm" position="5.69321,398.344,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="45.1194,8.13137,mm" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" valign="64" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" visibility="1" valign="32" zValue="5" marginX="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>" id="" position="5.69321,406.988,mm" frame="false" referencePoint="0" size="118.192,7.80192,mm" blendMode="0" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="1" outlineWidthM="0.3,mm" positionOnPage="5.69321,406.988,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" 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>" positionOnPage="5.69321,406.988,mm" position="5.69321,406.988,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="118.192,7.80192,mm" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" valign="32" blendMode="0" htmlState="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" visibility="1" valign="64" zValue="4" marginX="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>" id="" position="148.501,398.344,mm" frame="false" referencePoint="0" size="93.5757,8.13167,mm" blendMode="0" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="1" outlineWidthM="0.3,mm" positionOnPage="148.501,398.344,mm" halign="2" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="4" background="false" type="65641" 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>" positionOnPage="148.501,398.344,mm" position="148.501,398.344,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="93.5757,8.13167,mm" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" valign="64" blendMode="0" htmlState="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../GunRun2022_250.png" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" anchorPoint="8" visibility="1" zValue="3" pictureHeight="26.4325" id="" svgBorderColor="0,0,0,255" position="243.319,382.696,mm" pictureWidth="49.3143" mode="1" frame="false" referencePoint="0" size="49.3143,31.2967,mm" resizeMode="0" blendMode="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="243.319,382.696,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="3" background="false" mode="1" type="65640" file="../GunRun2022_250.png" positionOnPage="243.319,382.696,mm" position="243.319,382.696,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="31.1059" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="8" frame="false" groupUuid="" excludeFromExports="0" size="49.3143,31.2967,mm" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" northOffset="0" blendMode="0" pictureHeight="31.2967">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34285,221 +30052,188 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" visibility="1" zValue="2" id="" position="5.84321,406.626,mm" frame="false" referencePoint="0" size="236.083,0.14328,mm" cornerRadiusMeasure="0,mm" blendMode="0" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" groupUuid="" opacity="1" shapeType="1" type="65643" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="5.84321,406.626,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="false" type="65643" positionOnPage="5.84321,406.626,mm" position="5.84321,406.626,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="236.083,0.14328,mm" cornerRadiusMeasure="0,mm" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="0,0,0,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="solid" name="outline_style"/>
-              <Option type="QString" value="0.3" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="true" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" visibility="1" zValue="1" mapRotation="0" followPresetName="Marshal plan" id="" position="5.03,5.9483,mm" isTemporal="0" frame="false" referencePoint="0" size="286.94,392.396,mm" keepLayerSet="false" blendMode="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" groupUuid="" opacity="1" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="5.03,5.9483,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="5.03,5.9483,mm" position="5.03,5.9483,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="286.94,392.396,mm" mapRotation="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" itemRotation="0" id="" isTemporal="0" followPresetName="Marshal plan" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.91890002608484167" xmin="18.39785407807089612" xmax="18.41474568521422484" ymax="-33.89580042337001231"/>
+        <Extent ymax="-33.89580042337001231" xmin="18.39785407807089612" ymin="-33.91890002608484167" xmax="18.41474568521422484"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="int" value="0" name="forceVector"/>
-          <Option type="int" value="1" name="pdfAppendGeoreference"/>
-          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
-          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="" name="pdfExportThemes"/>
-          <Option type="int" value="1" name="pdfIncludeMetadata"/>
-          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" name="pdfLayerOrder"/>
-          <Option type="int" value="0" name="pdfLosslessImages"/>
-          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
-          <Option type="int" value="1" name="pdfSimplify"/>
-          <Option type="int" value="0" name="pdfTextFormat"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
         </Option>
       </customproperties>
-      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortFeatures="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortKey="page" filterFeatures="0" coverageLayerName="marshal_overviews" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas sortKey="page" filterFeatures="0" pageNameExpression="&quot;page&quot;" coverageLayerName="marshal_overviews" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerProvider="ogr" sortAscending="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="300" units="mm" name="Fencing - Cones only">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetX="0" offsetY="0" resolution="10" resUnits="mm" offsetUnits="mm"/>
+    <Layout units="mm" name="Fencing - Cones only" printResolution="300" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
+      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{33898621-24b6-4a0f-ad6f-29711c6feb21}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="255,255,255,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="no" name="outline_style"/>
-              <Option type="QString" value="0.26" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="255,255,255,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="no" type="QString"/>
+              <Option name="outline_width" value="0.26" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem itemRotation="0" background="true" frameJoinStyle="miter" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" visibility="1" zValue="0" id="" position="0,0,mm" frame="false" referencePoint="0" size="297,210,mm" blendMode="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" groupUuid="" opacity="1" type="65638" positionLock="false" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="0,0,mm">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" blendMode="0">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="miter" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="miter" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -34507,15 +30241,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" wrapChar="" fontColor="#000000" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" equalColumnWidth="1" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" wmsLegendWidth="50" referencePoint="0" outlineWidthM="0.3,mm" id="" lineSpacing="1" symbolAlignment="1" itemRotation="0" minSymbolSize="0" maxSymbolSize="0" symbolHeight="4" zValue="11" type="65642" position="256.808,5.21277,mm" opacity="1" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" visibility="1" background="true" resizeToContents="0" rasterBorderColor="0,0,0,255" size="38.1563,53.7608,mm" excludeFromExports="0" rasterBorderWidth="0" frame="true" titleAlignment="1" blendMode="0" positionOnPage="256.808,5.21277,mm" legendFilterByAtlas="0" frameJoinStyle="miter" groupUuid="" symbolWidth="7" boxSpace="2" positionLock="true" splitLayer="0" title="" columnCount="1" wmsLegendHeight="25" rasterBorder="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="11" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="256.808,5.21277,mm" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" frame="true" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" groupUuid="" size="38.1563,53.7608,mm" symbolAlignment="1" blendMode="0" resizeToContents="0" symbolWidth="7" positionLock="true">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34523,53 +30257,278 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" bold="1" italic="0" style="Bold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="3" indent="0" name="group" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="group" indent="0" marginTop="3">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="3" indent="0" name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" italic="0" style="Semibold" strikethrough="0" underline="0"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="3">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0" italic="0" style="" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
-          <style marginTop="2" marginLeft="2" indent="0" name="symbolLabel" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0" italic="0" style="Regular" strikethrough="0" underline="0"/>
+          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
+            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <families/>
+              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" value="" type="QString"/>
+                      <Option name="properties"/>
+                      <Option name="type" value="collection" type="QString"/>
+                    </Option>
+                  </data_defined_properties>
+                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <Option type="Map">
+                      <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="color" value="255,255,255,255" type="QString"/>
+                      <Option name="joinstyle" value="bevel" type="QString"/>
+                      <Option name="offset" value="0,0" type="QString"/>
+                      <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                      <Option name="offset_unit" value="MM" type="QString"/>
+                      <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                      <Option name="outline_style" value="no" type="QString"/>
+                      <Option name="outline_width" value="0" type="QString"/>
+                      <Option name="outline_width_unit" value="MM" type="QString"/>
+                      <Option name="style" value="solid" type="QString"/>
+                    </Option>
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" value="" type="QString"/>
+                        <Option name="properties"/>
+                        <Option name="type" value="collection" type="QString"/>
+                      </Option>
+                    </data_defined_properties>
+                  </layer>
+                </symbol>
+              </background>
+              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties"/>
+                  <Option name="type" value="collection" type="QString"/>
+                </Option>
+              </dd_properties>
+            </text-style>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Fencing and Cones">
+          <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="fencing" source="./fencing.shp|layername=fencing" patch_size="0,0">
+            <layer-tree-layer name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_exp="" patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
-                  <Option type="QString" value="" name="legend/expressionFilter"/>
-                  <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
-                  <Option type="QString" value="1,4" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
+                  <Option name="legend/expressionFilter" value="" type="QString"/>
+                  <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+                  <Option name="legend/node-order" value="1,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" name="all_routes" source="./all_routes.shp|layername=all_routes" patch_size="0,0">
+            <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
-                  <Option type="QString" value="hidden" name="legend/title-style"/>
-                  <Option type="int" value="0" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -34577,459 +30536,393 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" visibility="1" valign="32" zValue="10" marginX="0" labelText="CONES: [% &quot;name&quot; %]" id="" position="6.76779,191.188,mm" frame="false" referencePoint="0" size="148.46,6.45211,mm" blendMode="0" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="6.76779,191.188,mm" halign="1" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="10" background="false" type="65641" labelText="CONES: [% &quot;name&quot; %]" positionOnPage="6.76779,191.188,mm" position="6.76779,191.188,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="148.46,6.45211,mm" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="63" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" visibility="1" valign="64" zValue="9" marginX="0" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" id="" position="182.723,191.188,mm" frame="false" referencePoint="0" size="56.3557,6.45237,mm" blendMode="0" uuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="1" outlineWidthM="0.3,mm" positionOnPage="182.723,191.188,mm" halign="2" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="9" background="false" type="65641" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" positionOnPage="182.723,191.188,mm" position="182.723,191.188,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="56.3557,6.45237,mm" uuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" valign="64" blendMode="0" htmlState="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" visibility="1" valign="32" zValue="8" marginX="0" labelText="REVISION 5.0" id="" position="209.146,198.083,mm" frame="false" referencePoint="0" size="26.8205,6.82826,mm" blendMode="0" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="209.146,198.083,mm" halign="2" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="REVISION 3.0" positionOnPage="209.146,198.083,mm" position="209.146,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="26.8205,6.82826,mm" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" visibility="0" valign="32" zValue="7" marginX="1" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" id="" position="62.6706,198.083,mm" frame="false" referencePoint="0" size="51.1638,7.07327,mm" blendMode="0" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="62.6706,198.083,mm" halign="1" marginY="1">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="false" type="65641" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" positionOnPage="62.6706,198.083,mm" position="62.6706,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.1638,7.07327,mm" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" itemRotation="0" id="" halign="1" visibility="0" positionLock="true" marginY="1" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" visibility="1" valign="32" zValue="6" marginX="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" id="" position="116.805,198.083,mm" frame="false" referencePoint="0" size="64.7594,7.10512,mm" blendMode="0" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="116.805,198.083,mm" halign="1" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" positionOnPage="116.805,198.083,mm" position="116.805,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="64.7594,7.10512,mm" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" visibility="1" valign="32" zValue="5" marginX="0" labelText="Page [% @atlas_featurenumber %]" id="" position="6.76779,198.083,mm" frame="false" referencePoint="0" size="90.2083,7.07327,mm" blendMode="0" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" groupUuid="" opacity="1" type="65641" positionLock="true" excludeFromExports="0" htmlState="0" outlineWidthM="0.3,mm" positionOnPage="6.76779,198.083,mm" halign="1" marginY="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="Page [% @atlas_featurenumber %]" positionOnPage="6.76779,198.083,mm" position="6.76779,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="90.2083,7.07327,mm" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" valign="32" blendMode="0" htmlState="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" file="../GunRun2022_250.png" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" anchorPoint="8" visibility="1" zValue="4" pictureHeight="26.4325" id="" svgBorderColor="0,0,0,255" position="243.098,175.353,mm" pictureWidth="49.3143" mode="1" frame="false" referencePoint="0" size="49.3143,29.8354,mm" resizeMode="0" blendMode="0" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" groupUuid="" opacity="1" svgBorderWidth="0.2" northMode="0" type="65640" positionLock="true" pictureRotation="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" northOffset="0" positionOnPage="243.098,175.353,mm" svgFillColor="255,255,255,255">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="1" type="65640" file="../GunRun2022_250.png" positionOnPage="243.098,175.353,mm" position="243.098,175.353,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="29.6535" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="8" frame="false" groupUuid="" excludeFromExports="0" size="49.3143,29.8354,mm" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" northOffset="0" blendMode="0" pictureHeight="29.8354">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="int" value="3" name="type"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35037,505 +30930,380 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" frameJoinStyle="miter" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" visibility="1" zValue="3" id="" position="6.91779,197.79,mm" frame="false" referencePoint="0" size="232.01,0.14328,mm" cornerRadiusMeasure="0,mm" blendMode="0" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" groupUuid="" opacity="1" shapeType="1" type="65643" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" positionOnPage="6.91779,197.79,mm">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65643" positionOnPage="6.91779,197.79,mm" position="6.91779,197.79,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="232.01,0.14328,mm" cornerRadiusMeasure="0,mm" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+          <layer id="{96fb0bca-784b-4a29-b691-c08ef223150d}" locked="0" enabled="1" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-              <Option type="QString" value="0,0,0,255" name="color"/>
-              <Option type="QString" value="miter" name="joinstyle"/>
-              <Option type="QString" value="0,0" name="offset"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-              <Option type="QString" value="MM" name="offset_unit"/>
-              <Option type="QString" value="0,0,0,255" name="outline_color"/>
-              <Option type="QString" value="solid" name="outline_style"/>
-              <Option type="QString" value="0.3" name="outline_width"/>
-              <Option type="QString" value="MM" name="outline_width_unit"/>
-              <Option type="QString" value="solid" name="style"/>
+              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="color" value="0,0,0,255" type="QString"/>
+              <Option name="joinstyle" value="miter" type="QString"/>
+              <Option name="offset" value="0,0" type="QString"/>
+              <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offset_unit" value="MM" type="QString"/>
+              <Option name="outline_color" value="0,0,0,255" type="QString"/>
+              <Option name="outline_style" value="solid" type="QString"/>
+              <Option name="outline_width" value="0.3" type="QString"/>
+              <Option name="outline_width_unit" value="MM" type="QString"/>
+              <Option name="style" value="solid" type="QString"/>
             </Option>
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem maxBarWidth="100" minBarWidth="25" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" referencePoint="0" outlineWidthM="0.3,mm" id="" labelBarSpace="1" itemRotation="0" lineJoinStyle="round" unitType="meters" segmentSizeMode="1" zValue="2" boxContentSpace="0.2" type="65646" numSubdivisions="1" segmentMillimeters="25.0725" position="6.76779,2.8482,mm" opacity="1" numUnitsPerSegment="30" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" visibility="1" background="false" numMapUnitsPerScaleBarUnit="1" numSegments="2" height="2" labelHorizontalPlacement="0" subdivisionsHeight="1.5" size="84.9787,15.8378,mm" excludeFromExports="0" numSegmentsLeft="2" frame="false" labelVerticalPlacement="0" outlineWidth="0.2" unitLabel="m" blendMode="0" positionOnPage="6.76779,2.8482,mm" frameJoinStyle="miter" groupUuid="" positionLock="true" style="Double Box" lineCapStyle="square" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" alignment="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem minBarWidth="25" opacity="1" lineJoinStyle="round" numSegmentsLeft="2" unitLabel="m" labelVerticalPlacement="0" segmentMillimeters="26.1864" numUnitsPerSegment="30" zValue="2" numSegments="2" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" segmentSizeMode="1" type="65646" subdivisionsHeight="1.5" height="2" numSubdivisions="1" lineCapStyle="square" outlineWidth="0.2" visibility="1" frameJoinStyle="miter" itemRotation="0" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" outlineWidthM="0.3,mm" positionOnPage="6.76779,2.8482,mm" frame="false" referencePoint="0" style="Double Box" unitType="meters" maxBarWidth="100" boxContentSpace="0.2" id="" background="false" excludeFromExports="0" labelHorizontalPlacement="0" alignment="0" groupUuid="" size="88.3204,15.8378,mm" blendMode="0" labelBarSpace="1" positionLock="true">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="12" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM"/>
-          <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-            <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                  <Option type="QString" value="255,255,255,255" name="color"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                  <Option type="QString" value="no" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="solid" name="style"/>
+                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="color" value="255,255,255,255" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                  <Option name="outline_style" value="no" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="style" value="solid" type="QString"/>
                 </Option>
-                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                <prop v="255,255,255,255" k="color"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="128,128,128,255" k="outline_color"/>
-                <prop v="no" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor red="0" green="0" blue="0" alpha="255"/>
+        <strokeColor blue="0" green="0" red="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="QChar" value="" name="decimal_separator"/>
-            <Option type="int" value="6" name="decimals"/>
-            <Option type="int" value="0" name="rounding_type"/>
-            <Option type="bool" value="false" name="show_plus"/>
-            <Option type="bool" value="true" name="show_thousand_separator"/>
-            <Option type="bool" value="false" name="show_trailing_zeros"/>
-            <Option type="QChar" value="" name="thousand_separator"/>
+            <Option name="decimal_separator" type="invalid"/>
+            <Option name="decimals" value="6" type="int"/>
+            <Option name="rounding_type" value="0" type="int"/>
+            <Option name="show_plus" value="false" type="bool"/>
+            <Option name="show_thousand_separator" value="true" type="bool"/>
+            <Option name="show_trailing_zeros" value="false" type="bool"/>
+            <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor red="0" green="0" blue="0" alpha="255"/>
-        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
+        <fillColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
         <lineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{ba8b697f-af10-49bc-b789-55678d099479}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.2" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.2" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.2" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.2" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+            <layer id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}" locked="0" enabled="1" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option type="QString" value="0" name="align_dash_pattern"/>
-                <Option type="QString" value="square" name="capstyle"/>
-                <Option type="QString" value="5;2" name="customdash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                <Option type="QString" value="MM" name="customdash_unit"/>
-                <Option type="QString" value="0" name="dash_pattern_offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                <Option type="QString" value="0" name="draw_inside_polygon"/>
-                <Option type="QString" value="round" name="joinstyle"/>
-                <Option type="QString" value="0,0,0,255" name="line_color"/>
-                <Option type="QString" value="solid" name="line_style"/>
-                <Option type="QString" value="0.2" name="line_width"/>
-                <Option type="QString" value="MM" name="line_width_unit"/>
-                <Option type="QString" value="0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="0" name="ring_filter"/>
-                <Option type="QString" value="0" name="trim_distance_end"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                <Option type="QString" value="0" name="trim_distance_start"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                <Option type="QString" value="0" name="use_custom_dash"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="round" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.2" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
-              <prop v="0" k="align_dash_pattern"/>
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.2" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="trim_distance_end"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_end_unit"/>
-              <prop v="0" k="trim_distance_start"/>
-              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-              <prop v="MM" k="trim_distance_start_unit"/>
-              <prop v="0" k="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{7f05af9e-0111-48af-a2c9-889d710570e0}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol force_rhr="0" type="fill" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <layer id="{c90aa551-e7ed-4710-acac-e5698540a53e}" locked="0" enabled="1" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0.26" name="outline_width"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                <Option name="outline_style" value="no" type="QString"/>
+                <Option name="outline_width" value="0.26" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="255,255,255,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem itemRotation="0" background="false" followPreset="true" frameJoinStyle="miter" mapFlags="0" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" visibility="1" zValue="1" mapRotation="0" followPresetName="Cones" id="" position="6.76779,9.35102,mm" isTemporal="0" frame="false" referencePoint="0" size="283.418,180.92,mm" keepLayerSet="false" blendMode="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" groupUuid="" opacity="0.9" type="65639" positionLock="true" excludeFromExports="0" outlineWidthM="0.3,mm" labelMargin="0,mm" positionOnPage="6.76779,9.35102,mm" drawCanvasItems="false">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="false" type="65639" positionOnPage="6.76779,9.35102,mm" position="6.76779,9.35102,mm" outlineWidthM="0.3,mm" opacity="0.9" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="283.418,180.92,mm" mapRotation="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" itemRotation="0" id="" isTemporal="0" followPresetName="Cones" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" followPreset="true" blendMode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="" name="expression"/>
-                  <Option type="Map" name="transformer">
-                    <Option type="Map" name="d">
-                      <Option type="double" value="1" name="exponent"/>
-                      <Option type="double" value="360" name="maxOutput"/>
-                      <Option type="double" value="0" name="maxValue"/>
-                      <Option type="double" value="0" name="minOutput"/>
-                      <Option type="double" value="0" name="minValue"/>
-                      <Option type="double" value="0" name="nullOutput"/>
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="transformer" type="Map">
+                    <Option name="d" type="Map">
+                      <Option name="exponent" value="1" type="double"/>
+                      <Option name="maxOutput" value="360" type="double"/>
+                      <Option name="maxValue" value="0" type="double"/>
+                      <Option name="minOutput" value="0" type="double"/>
+                      <Option name="minValue" value="0" type="double"/>
+                      <Option name="nullOutput" value="0" type="double"/>
                     </Option>
-                    <Option type="int" value="0" name="t"/>
+                    <Option name="t" value="0" type="int"/>
                   </Option>
-                  <Option type="int" value="3" name="type"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" value="false" name="active"/>
-                  <Option type="QString" value="angle" name="field"/>
-                  <Option type="int" value="2" name="type"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="field" value="angle" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90219936134110412" xmin="18.40670677609450223" xmax="18.40975312970203248" ymax="-33.90025472328818523"/>
+        <Extent ymax="-33.91866254684331494" xmin="18.38081056635935795" ymin="-33.92052446432401069" xmax="18.3837273348683965"/>
         <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>
@@ -35550,138 +31318,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftAnnotationDisplay="3" bottomAnnotationDirection="0" intervalY="5" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" topAnnotationDisplay="3" showAnnotation="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" annotationPrecision="3" gridFrameWidth="2" rightAnnotationDirection="0" topAnnotationPosition="1" show="0" leftFrameDivisions="0" minimumIntervalWidth="50" rotatedTicksEnabled="0" gridFrameSideFlags="15" annotationExpression="" position="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalX="5" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rotatedTicksMinimumAngle="0" crossLength="3" rightAnnotationDisplay="3" bottomAnnotationPosition="1" bottomFrameDivisions="0" gridStyle="0" annotationFormat="4" blendMode="0" topAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetY="0" gridFrameMargin="0" gridFramePenColor="0,0,0,255" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" leftAnnotationDirection="0" rotatedTicksMarginToCorner="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="3" name="Grid 1" frameAnnotationDistance="1" unit="1" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="3" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="1" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="3" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="3" bottomAnnotationPosition="1" annotationFormat="4" intervalX="5" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="3" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="5" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <layer id="{7f8bc30c-a977-4770-97ae-b052397815c8}" locked="0" enabled="1" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="align_dash_pattern"/>
-                  <Option type="QString" value="square" name="capstyle"/>
-                  <Option type="QString" value="5;2" name="customdash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="customdash_unit"/>
-                  <Option type="QString" value="0" name="dash_pattern_offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-                  <Option type="QString" value="0" name="draw_inside_polygon"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="195,195,195,255" name="line_color"/>
-                  <Option type="QString" value="solid" name="line_style"/>
-                  <Option type="QString" value="0" name="line_width"/>
-                  <Option type="QString" value="MM" name="line_width_unit"/>
-                  <Option type="QString" value="0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0" name="ring_filter"/>
-                  <Option type="QString" value="0" name="trim_distance_end"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-                  <Option type="QString" value="0" name="trim_distance_start"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-                  <Option type="QString" value="0" name="use_custom_dash"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" value="0" type="QString"/>
+                  <Option name="capstyle" value="square" type="QString"/>
+                  <Option name="customdash" value="5;2" type="QString"/>
+                  <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="customdash_unit" value="MM" type="QString"/>
+                  <Option name="dash_pattern_offset" value="0" type="QString"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                  <Option name="draw_inside_polygon" value="0" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="line_color" value="195,195,195,255" type="QString"/>
+                  <Option name="line_style" value="solid" type="QString"/>
+                  <Option name="line_width" value="0" type="QString"/>
+                  <Option name="line_width_unit" value="MM" type="QString"/>
+                  <Option name="offset" value="0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="ring_filter" value="0" type="QString"/>
+                  <Option name="trim_distance_end" value="0" type="QString"/>
+                  <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                  <Option name="trim_distance_start" value="0" type="QString"/>
+                  <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                  <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                  <Option name="use_custom_dash" value="0" type="QString"/>
+                  <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 </Option>
-                <prop v="0" k="align_dash_pattern"/>
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="dash_pattern_offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-                <prop v="MM" k="dash_pattern_offset_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="195,195,195,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="trim_distance_end"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_end_unit"/>
-                <prop v="0" k="trim_distance_start"/>
-                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
-                <prop v="MM" k="trim_distance_start_unit"/>
-                <prop v="0" k="tweak_dash_pattern_on_corners"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" is_animated="0" name="" frame_rate="10" clip_to_extent="1" alpha="1">
+            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <layer id="{490d72bf-21ae-4699-adef-94db3e5bc496}" locked="0" enabled="1" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option type="QString" value="0" name="angle"/>
-                  <Option type="QString" value="square" name="cap_style"/>
-                  <Option type="QString" value="0,0,0,255" name="color"/>
-                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                  <Option type="QString" value="bevel" name="joinstyle"/>
-                  <Option type="QString" value="circle" name="name"/>
-                  <Option type="QString" value="0,0" name="offset"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="offset_unit"/>
-                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
-                  <Option type="QString" value="solid" name="outline_style"/>
-                  <Option type="QString" value="0" name="outline_width"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="outline_width_unit"/>
-                  <Option type="QString" value="diameter" name="scale_method"/>
-                  <Option type="QString" value="2" name="size"/>
-                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                  <Option type="QString" value="MM" name="size_unit"/>
-                  <Option type="QString" value="1" name="vertical_anchor_point"/>
+                  <Option name="angle" value="0" type="QString"/>
+                  <Option name="cap_style" value="square" type="QString"/>
+                  <Option name="color" value="0,0,0,255" type="QString"/>
+                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                  <Option name="joinstyle" value="bevel" type="QString"/>
+                  <Option name="name" value="circle" type="QString"/>
+                  <Option name="offset" value="0,0" type="QString"/>
+                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offset_unit" value="MM" type="QString"/>
+                  <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                  <Option name="outline_style" value="solid" type="QString"/>
+                  <Option name="outline_width" value="0" type="QString"/>
+                  <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="outline_width_unit" value="MM" type="QString"/>
+                  <Option name="scale_method" value="diameter" type="QString"/>
+                  <Option name="size" value="2" type="QString"/>
+                  <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="size_unit" value="MM" type="QString"/>
+                  <Option name="vertical_anchor_point" value="1" type="QString"/>
                 </Option>
-                <prop v="0" k="angle"/>
-                <prop v="square" k="cap_style"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -35698,69 +31420,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style namedStyle="" fontItalic="0" fontUnderline="0" capitalization="0" fontLetterSpacing="0" forcedItalic="0" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" fontStrikeout="0" allowHtml="0" multilineHeight="1" blendMode="0" fontKerning="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontWordSpacing="0" textOrientation="horizontal" fontSize="10" fontWeight="50" fontSizeUnit="Point" fontFamily="Myriad Pro" forcedBold="0">
+          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM"/>
-            <background shapeRadiiUnit="MM" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeRadiiY="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeBorderWidth="0" shapeOffsetY="0" shapeSizeX="0">
-              <symbol force_rhr="0" type="fill" is_animated="0" name="fillSymbol" frame_rate="10" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
+              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                    <Option type="QString" value="255,255,255,255" name="color"/>
-                    <Option type="QString" value="bevel" name="joinstyle"/>
-                    <Option type="QString" value="0,0" name="offset"/>
-                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                    <Option type="QString" value="MM" name="offset_unit"/>
-                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                    <Option type="QString" value="no" name="outline_style"/>
-                    <Option type="QString" value="0" name="outline_width"/>
-                    <Option type="QString" value="MM" name="outline_width_unit"/>
-                    <Option type="QString" value="solid" name="style"/>
+                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="color" value="255,255,255,255" type="QString"/>
+                    <Option name="joinstyle" value="bevel" type="QString"/>
+                    <Option name="offset" value="0,0" type="QString"/>
+                    <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offset_unit" value="MM" type="QString"/>
+                    <Option name="outline_color" value="128,128,128,255" type="QString"/>
+                    <Option name="outline_style" value="no" type="QString"/>
+                    <Option name="outline_width" value="0" type="QString"/>
+                    <Option name="outline_width_unit" value="MM" type="QString"/>
+                    <Option name="style" value="solid" type="QString"/>
                   </Option>
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="128,128,128,255" k="outline_color"/>
-                  <prop v="no" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100" shadowOpacity="0.69999999999999996" shadowBlendMode="6"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -35768,46 +31479,46 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" forceLabelsInside="0" clippingType="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" value="png" name="atlasRasterFormat"/>
-          <Option type="int" value="0" name="forceVector"/>
-          <Option type="QString" value="true" name="imageAntialias"/>
-          <Option type="QString" value="0" name="imageCropMarginBottom"/>
-          <Option type="QString" value="0" name="imageCropMarginLeft"/>
-          <Option type="QString" value="0" name="imageCropMarginRight"/>
-          <Option type="QString" value="0" name="imageCropMarginTop"/>
-          <Option type="QString" value="false" name="imageCropToContents"/>
-          <Option type="int" value="1" name="pdfAppendGeoreference"/>
-          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
-          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
-          <Option type="QString" value="0" name="pdfExportGeoPdfFeatures"/>
-          <Option type="QString" value="" name="pdfExportThemes"/>
-          <Option type="int" value="1" name="pdfIncludeMetadata"/>
-          <Option 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" name="pdfLayerOrder"/>
-          <Option type="int" value="0" name="pdfLosslessImages"/>
-          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
-          <Option type="int" value="1" name="pdfSimplify"/>
-          <Option type="int" value="0" name="pdfTextFormat"/>
-          <Option type="QString" value="true" name="rasterize"/>
-          <Option type="bool" value="true" name="singleFile"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportGeoPdfFeatures" value="0" type="QString"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="rasterize" value="true" type="QString"/>
+          <Option name="singleFile" value="true" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" sortFeatures="1" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" sortKey="&quot;group&quot;" filterFeatures="0" coverageLayerName="cone_only_groups" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;" coverageLayerProvider="virtual" enabled="1"/>
+      <Atlas sortKey="&quot;group&quot;" filterFeatures="0" pageNameExpression="&quot;name&quot;" coverageLayerName="cone_only_groups" 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" sortAscending="1" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
-  <ProjectViewSettings UseProjectScales="0" rotation="0">
+  <ProjectViewSettings rotation="0" UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent ymin="-33.90381339025915253" xmin="18.40284388355583189" xmax="18.41822743815662733" ymax="-33.8995522642739715">
+    <DefaultViewExtent ymax="-33.89871642408721897" xmin="18.39262360336048019" ymin="-33.91404092163588047" xmax="18.42086732654766834">
       <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>
@@ -35821,42 +31532,58 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1" projectStyleId="attachment:///QnVUUv_styles.db">
+  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings cumulativeTemporalRange="0" frameRate="1" timeStepUnit="h" timeStep="1"/>
+  <ProjectTimeSettings frameRate="1" cumulativeTemporalRange="0" timeStep="1" timeStepUnit="h"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider offset="0" scale="1"/>
     </terrainProvider>
   </ElevationProperties>
-  <ProjectDisplaySettings>
+  <ProjectDisplaySettings CoordinateAxisOrder="Default" CoordinateType="MapCrs">
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option type="QChar" value="" name="decimal_separator"/>
-        <Option type="int" value="6" name="decimals"/>
-        <Option type="int" value="0" name="direction_format"/>
-        <Option type="int" value="0" name="rounding_type"/>
-        <Option type="bool" value="false" name="show_plus"/>
-        <Option type="bool" value="true" name="show_thousand_separator"/>
-        <Option type="bool" value="false" name="show_trailing_zeros"/>
-        <Option type="QChar" value="" name="thousand_separator"/>
+        <Option name="decimal_separator" type="invalid"/>
+        <Option name="decimals" value="6" type="int"/>
+        <Option name="direction_format" value="0" type="int"/>
+        <Option name="rounding_type" value="0" type="int"/>
+        <Option name="show_plus" value="false" type="bool"/>
+        <Option name="show_thousand_separator" value="true" type="bool"/>
+        <Option name="show_trailing_zeros" value="false" type="bool"/>
+        <Option name="thousand_separator" type="invalid"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option type="QString" value="DecimalDegrees" name="angle_format"/>
-        <Option type="QChar" value="" name="decimal_separator"/>
-        <Option type="int" value="6" name="decimals"/>
-        <Option type="int" value="0" name="rounding_type"/>
-        <Option type="bool" value="false" name="show_leading_degree_zeros"/>
-        <Option type="bool" value="false" name="show_leading_zeros"/>
-        <Option type="bool" value="false" name="show_plus"/>
-        <Option type="bool" value="false" name="show_suffix"/>
-        <Option type="bool" value="true" name="show_thousand_separator"/>
-        <Option type="bool" value="false" name="show_trailing_zeros"/>
-        <Option type="QChar" value="" name="thousand_separator"/>
+        <Option name="angle_format" value="DecimalDegrees" type="QString"/>
+        <Option name="decimal_separator" type="invalid"/>
+        <Option name="decimals" value="6" type="int"/>
+        <Option name="rounding_type" value="0" type="int"/>
+        <Option name="show_leading_degree_zeros" value="false" type="bool"/>
+        <Option name="show_leading_zeros" value="false" type="bool"/>
+        <Option name="show_plus" value="false" type="bool"/>
+        <Option name="show_suffix" value="false" type="bool"/>
+        <Option name="show_thousand_separator" value="true" type="bool"/>
+        <Option name="show_trailing_zeros" value="false" type="bool"/>
+        <Option name="thousand_separator" type="invalid"/>
       </Option>
     </GeographicCoordinateFormat>
+    <CoordinateCustomCrs>
+      <spatialrefsys nativeFormat="Wkt">
+        <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+        <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+        <srsid>3452</srsid>
+        <srid>4326</srid>
+        <authid>EPSG:4326</authid>
+        <description>WGS 84</description>
+        <projectionacronym>longlat</projectionacronym>
+        <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+        <geographicflag>true</geographicflag>
+      </spatialrefsys>
+    </CoordinateCustomCrs>
   </ProjectDisplaySettings>
+  <ProjectGpsSettings destinationLayerSource="Point?crs=EPSG:4326&amp;uid={98f1cf95-2d66-4e2b-ab42-5f814aa62a83}" destinationFollowsActiveLayer="1" destinationLayer="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" autoAddTrackVertices="0" destinationLayerProvider="memory" destinationLayerName="route_markers" autoCommitFeatures="0">
+    <timeStampFields/>
+  </ProjectGpsSettings>
 </qgis>
diff --git a/GIS Base Map/all_routes.dbf b/GIS Base Map/all_routes.dbf
index 0c78e3b..bba3083 100644
Binary files a/GIS Base Map/all_routes.dbf and b/GIS Base Map/all_routes.dbf differ
diff --git a/GIS Base Map/all_routes.shp b/GIS Base Map/all_routes.shp
index df93d9b..995e686 100644
Binary files a/GIS Base Map/all_routes.shp and b/GIS Base Map/all_routes.shp differ
diff --git a/GIS Base Map/all_routes.shx b/GIS Base Map/all_routes.shx
index 5df180e..56142b5 100644
Binary files a/GIS Base Map/all_routes.shx and b/GIS Base Map/all_routes.shx differ
diff --git a/GIS Base Map/fencing.dbf b/GIS Base Map/fencing.dbf
index 70a45d7..586c493 100644
Binary files a/GIS Base Map/fencing.dbf and b/GIS Base Map/fencing.dbf differ
diff --git a/GunRun2022_250.png b/GunRun2022_250.png
deleted file mode 100644
index 3325cd0..0000000
--- a/GunRun2022_250.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d438e9362c1634ed48f4e89bd0df5420fd3a5c23e06f0c82d9fc5f473957fd5e
-size 35915
diff --git a/GunRun2022_500.png b/GunRun2022_500.png
deleted file mode 100644
index 8e14e06..0000000
--- a/GunRun2022_500.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0aea98ddb3d92a362e568c4061b6c870e9847c2a0aeda794385de3b634a045a4
-size 91607
diff --git a/README.md b/README.md
index 720d035..e2dfb15 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ WHEN "Source" = '10KM' THEN
 		WHEN regexp_match( "Name", '^[2456]$') THEN 'R,BR'
 		WHEN regexp_match( "Name", '^[1]$') THEN 'T'
 		WHEN regexp_match( "Name", '^[3]$') THEN 'B'
-		WHEN regexp_match( "Name", '^Finish$') THEN 'TR,R'
+		WHEN regexp_match( "Name", '^Finish$') THEN 'BL,L'
 		WHEN regexp_match( "Name", '^Start$') THEN 'BL,L'
 	END
 WHEN "Source" = '5KM' THEN
diff --git a/create_index.py b/create_index.py
index 586b796..7341852 100755
--- a/create_index.py
+++ b/create_index.py
@@ -2,7 +2,7 @@
 
 import glob, fileinput, os, re, shutil, sys, tempfile, time
 
-year = 2022
+year = 2023
 webfile_dir = "~/public_html/GunRun{}/".format(year)
 print("NOTE: year is {}".format(year))